diff -Naur WindowMaker-0.91.0/acinclude.m4 wm/acinclude.m4 --- WindowMaker-0.91.0/acinclude.m4 2004-05-05 02:14:47 +0400 +++ wm/acinclude.m4 2004-10-30 10:39:27 +0400 @@ -41,6 +41,7 @@ AC_CACHE_VAL(ac_cv_lib_xft_version_ok, [AC_TRY_LINK( [/* Test version of libXft we have */ +#include #include #if !defined(XFT_VERSION) || XFT_VERSION < $xft_major_version*10000 + $xft_minor_version*100 + $xft_micro_version diff -Naur WindowMaker-0.91.0/aclocal.m4 wm/aclocal.m4 --- WindowMaker-0.91.0/aclocal.m4 2004-10-26 08:10:37 +0400 +++ wm/aclocal.m4 1970-01-01 03:00:00 +0300 @@ -1,7184 +0,0 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p6 - -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. - -#!/bin/sh - -dnl -dnl WM_CHECK_LIB(NAME, FUNCTION, EXTRALIBS) -dnl -AC_DEFUN(WM_CHECK_LIB, -[ -LDFLAGS_old="$LDFLAGS" -LDFLAGS="$LDFLAGS $lib_search_path" -AC_CHECK_LIB([$1],[$2],yes=yes,no=no,[$3]) -LDFLAGS="$LDFLAGS_old" -]) - - -dnl -dnl WM_CHECK_HEADER(NAME) -dnl -AC_DEFUN(WM_CHECK_HEADER, -[ -CPPFLAGS_old="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $inc_search_path" -AC_CHECK_HEADER([$1]) -CPPFLAGS="$CPPFLAGS_old" -]) - - -dnl -dnl WM_CHECK_XFT_VERSION(MIN_VERSION, [ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]) -dnl -dnl # $XFTFLAGS should be defined before calling this macro, -dnl # else it will not be able to find Xft.h -dnl -AC_DEFUN(WM_CHECK_XFT_VERSION, -[ -CPPFLAGS_old="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $XFTFLAGS $inc_search_path" -xft_major_version=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -xft_minor_version=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -xft_micro_version=`echo $1 | sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -AC_MSG_CHECKING([whether libXft is at least version $1]) -AC_CACHE_VAL(ac_cv_lib_xft_version_ok, -[AC_TRY_LINK( -[/* Test version of libXft we have */ -#include - -#if !defined(XFT_VERSION) || XFT_VERSION < $xft_major_version*10000 + $xft_minor_version*100 + $xft_micro_version -#error libXft on this system is too old. Consider upgrading to at least $1 -#endif -], [], -eval "ac_cv_lib_xft_version_ok=yes", -eval "ac_cv_lib_xft_version_ok=no")]) -if eval "test \"`echo '$ac_cv_lib_xft_version_ok'`\" = yes"; then - AC_MSG_RESULT(yes) - ifelse([$2], , :, [$2]) -else - AC_MSG_RESULT(no) - ifelse([$3], , , [$3]) -fi -CPPFLAGS="$CPPFLAGS_old" -]) - - -dnl -dnl WM_CHECK_REDCRAP_BUGS(prefix,bindir,libdir) -dnl -AC_DEFUN(WM_CHECK_REDCRAP_BUGS, -[ -AC_MSG_CHECKING(for RedHat system) -wm_check_flag='no :)' -rh_is_redhat=no -if test -f /etc/redhat-release; then - wm_check_flag=yes - rh_is_redhat=yes -fi -AC_MSG_RESULT($wm_check_flag) - -mins_found=no -bugs_found=no -if test "$wm_check_flag" = yes; then -echo -AC_MSG_WARN([Red Hat system; checking for Red-Hat-specific bugs.]) -echo -# -# Check old wmaker from RedHat -# -if test "[$1]" != "/usr/X11R6" -a "$prefix" != "/usr/X11"; then -AC_MSG_CHECKING(for multiple installed wmaker versions) -if test -f /usr/X11R6/bin/wmaker; then -AC_MSG_RESULT(uh oh) -mins_found=yes -rh_old_wmaker=yes -else -rh_old_wmaker=no -AC_MSG_RESULT(no apparent problems) -fi -fi -# -# Check for infamous en_RN bug -# Wont work because autoconf will change LANG in the beginning of the -# script. - -# -#AC_MSG_CHECKING(for silly en_RN joke that only causes headaches) -#echo $LANG -#if test "x$LANG" = xen_RN; then -#AC_MSG_RESULT(uh oh) -#AC_MSG_WARN([the LANG environment variable is set to the en_RN -#locale. Please unset it or you will have mysterious problems when -#using various software packages.]) -#bugs_found=yes -#else -#AC_MSG_RESULT(no problem) -#fi -# -# If binary installation path is /usr/local/bin, check if it's in PATH -# -if test "[$2]" = "/usr/local/bin"; then -AC_MSG_CHECKING(if /usr/local/bin is in the search PATH) -wm_check_flag=no -rh_missing_usr_local_bin=yes -old_IFS="$IFS" -IFS=":" -for i in $PATH; do - if test "x$i" = "x/usr/local/bin"; then - wm_check_flag=yes - rh_missing_usr_local_bin=no - break; - fi -done -IFS="$old_IFS" -if test "$wm_check_flag" = no; then -AC_MSG_RESULT(uh oh) -bugs_found=yes -else -AC_MSG_RESULT(no problem) -fi -fi -# -# If library installation path is /usr/local/lib, -# check if it's in /etc/ld.so.conf -# -if test "[$3]" = "/usr/local/lib"; then -wm_check_flag=yes -rh_missing_usr_local_lib=no -AC_MSG_CHECKING(if /usr/local/lib is in /etc/ld.so.conf) -test -z "`grep /usr/local/lib /etc/ld.so.conf`" -test "$?" -eq 0 && wm_check_flag=no -if test "$wm_check_flag" = no; then -AC_MSG_RESULT(uh oh) -rh_missing_usr_local_lib=yes -bugs_found=yes -else -AC_MSG_RESULT(no problem) -fi -fi -# -# Check for symbolic links -# -AC_MSG_CHECKING(for /usr/include/X11 symbolic link) -rh_missing_usr_include_x11=no -if test -d "/usr/include/X11"; then -AC_MSG_RESULT(found) -else -AC_MSG_RESULT(uh oh) -rh_missing_usr_include_x11=yes -mins_found=yes -fi - -# -# Check for /lib/cpp -# -AC_MSG_CHECKING(for /lib/cpp) -rh_missing_lib_cpp=no -if test -f "/lib/cpp"; then -AC_MSG_RESULT(found) -else -AC_MSG_RESULT(uh oh) -rh_missing_lib_cpp=yes -bugs_found=yes -fi - -echo -fi -]) - - -dnl -dnl WM_PRINT_REDCRAP_BUG_STATUS() -dnl -AC_DEFUN(WM_PRINT_REDCRAP_BUG_STATUS, -[ -if test "$rh_is_redhat" = yes; then -if test "$mins_found" = yes -o "$bugs_found" = yes; then -echo -AC_MSG_WARN([It seems you are using a system packaged by Red Hat. -I have done some checks for Red-Hat-specific bugs, and I found some -problems. Please read the INSTALL file regarding Red Hat, resolve -the problems, and try to run configure again. - -Here are the problems I found: -]) -if test "x$rh_old_wmaker" = xyes; then -echo "Problem: Old version of Window Maker in /usr/X11R6/bin." -echo "Description: You seem to have an old version of Window Maker" -echo " installed in /usr/X11R6/bin. It is recommended" -echo " that you uninstall any previously installed" -echo " packages of WindowMaker before installing a new one." -echo -fi -if test "x$rh_missing_usr_local_bin" = xyes; then -echo "Problem: PATH is missing /usr/local/bin." -echo "Description: Your PATH environment variable does not appear to" -echo " contain the directory /usr/local/bin. Please add it." -echo -fi -if test "x$rh_missing_usr_local_lib" = xyes; then -echo "Problem: /etc/ld.so.conf missing /usr/local/lib" -echo "Description: Your /etc/ld.so.conf file does not appear to contain" -echo " the directory /usr/local/lib. Please add it." -echo -fi -if test "x$rh_missing_usr_x11" = xyes; then -echo "Problem: Missing /usr/X11 symbolic link." -echo "Description: Your system is missing a symbolic link from" -echo " /usr/X11R6 to /usr/X11. Please create one." -echo -fi -if test "x$rh_missing_usr_include_x11" = xyes; then -echo "Problem: Missing /usr/include/X11 symbolic link." -echo "Description: Your system is missing a symbolic link from" -echo " /usr/X11R6/include/X11 to /usr/include/X11." -echo " Please create one." -echo -fi -if test "x$rh_missing_lib_cpp" = xyes; then -echo "Problem: Missing /lib/cpp symbolic link." -echo "Description: Your system is missing a symbolic link from the" -echo " cpp (C preprocessor) program to /lib/cpp." -echo " Please create one." -echo -fi -if test "x$bugs_found" = xyes; then -AC_MSG_ERROR([One or more of the problems above can potentially -cause Window Maker not to install or run properly. Please resolve -the problems and try to run configure again.]) -exit 1 -elif test "x$mins_found" = xyes; then -AC_MSG_WARN([The problems above may or may not cause Window Maker -not to install or run properly. If you have any problems during -installation or execution, please resolve the problems and try to -install Window Maker again.]) -echo -fi -else -echo -echo "You appear to have a system packaged by Red Hat, but I could" -echo "not find any Red-Hat-specific problems that I know about." -echo -fi -fi -]) - - -# lib-prefix.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and -dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't -dnl require excessive bracketing. -ifdef([AC_HELP_STRING], -[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], -[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -# lib-link.m4 serial 4 (gettext-0.12) -dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. -AC_DEFUN([AC_LIB_RPATH], -[ - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" - dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, - [ --disable-rpath do not hardcode runtime library paths], - :, enable_rpath=yes) -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -R*) - dir=`echo "X$dep" | sed -e 's/^X-R//'` - if test "$enable_rpath" != no; then - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $dir" - fi - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $dir" - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. - -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_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. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in - *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; - *) - test "$with_gnu_ld" != yes && break ;; - esac - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) - -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. - -# serial 1 - -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) - -AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -fi -ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) - -# Copyright 2002 Free Software Foundation, Inc. - -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) -# any later version. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. - -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - -# AM_AUTOMAKE_VERSION(VERSION) -# ---------------------------- -# Automake X.Y traces this macro to ensure aclocal.m4 has been -# generated from the m4 files accompanying Automake X.Y. -AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.4"]) - -# AM_SET_CURRENT_AUTOMAKE_VERSION -# ------------------------------- -# Call AM_AUTOMAKE_VERSION so it can be traced. -# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. -AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], - [AM_AUTOMAKE_VERSION([1.4-p6])]) - -# -# Check to make sure that the build environment is sane. -# - -AC_DEFUN([AM_SANITY_CHECK], -[AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftestfile -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` - fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - - test "[$]2" = conftestfile - ) -then - # Ok. - : -else - AC_MSG_ERROR([newly created file is older than distributed files! -Check your system clock]) -fi -rm -f conftest* -AC_MSG_RESULT(yes)]) - -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. -AC_DEFUN([AM_MISSING_PROG], -[AC_MSG_CHECKING(for working $2) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) -else - $1="$3/missing $2" - AC_MSG_RESULT(missing) -fi -AC_SUBST($1)]) - -# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- - -# serial 47 AC_PROG_LIBTOOL -# Debian $Rev: 214 $ - - -# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED) -# ----------------------------------------------------------- -# If this macro is not defined by Autoconf, define it here. -m4_ifdef([AC_PROVIDE_IFELSE], - [], - [m4_define([AC_PROVIDE_IFELSE], - [m4_ifdef([AC_PROVIDE_$1], - [$2], [$3])])]) - - -# AC_PROG_LIBTOOL -# --------------- -AC_DEFUN([AC_PROG_LIBTOOL], -[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl -dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX -dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX. - AC_PROVIDE_IFELSE([AC_PROG_CXX], - [AC_LIBTOOL_CXX], - [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX - ])]) -dnl And a similar setup for Fortran 77 support - AC_PROVIDE_IFELSE([AC_PROG_F77], - [AC_LIBTOOL_F77], - [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77 -])]) - -dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly. -dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run -dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both. - AC_PROVIDE_IFELSE([AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ], - [AC_LIBTOOL_GCJ], - [ifdef([AC_PROG_GCJ], - [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([A][M_PROG_GCJ], - [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])]) - ifdef([LT_AC_PROG_GCJ], - [define([LT_AC_PROG_GCJ], - defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])]) -])])# AC_PROG_LIBTOOL - - -# _AC_PROG_LIBTOOL -# ---------------- -AC_DEFUN([_AC_PROG_LIBTOOL], -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl -AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl -AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl -AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -# Prevent multiple expansion -define([AC_PROG_LIBTOOL], []) -])# _AC_PROG_LIBTOOL - - -# AC_LIBTOOL_SETUP -# ---------------- -AC_DEFUN([AC_LIBTOOL_SETUP], -[AC_PREREQ(2.50)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl -AC_REQUIRE([AC_PROG_NM])dnl - -AC_REQUIRE([AC_PROG_LN_S])dnl -AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! -AC_REQUIRE([AC_OBJEXT])dnl -AC_REQUIRE([AC_EXEEXT])dnl -dnl - -AC_LIBTOOL_SYS_MAX_CMD_LEN -AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -AC_LIBTOOL_OBJDIR - -AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -_LT_AC_PROG_ECHO_BACKSLASH - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' -[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'] - -# Same as above, but do not quote variable references. -[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'] - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Constants: -rm="rm -f" - -# Global variables: -default_ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except M$VC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" - -AC_CHECK_TOOL(AR, ar, false) -AC_CHECK_TOOL(RANLIB, ranlib, :) -AC_CHECK_TOOL(STRIP, strip, :) - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" - ;; - *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - AC_PATH_MAGIC - fi - ;; -esac - -AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no) -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -enable_win32_dll=yes, enable_win32_dll=no) - -AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -AC_ARG_WITH([pic], - [AC_HELP_STRING([--with-pic], - [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], - [pic_mode=default]) -test -z "$pic_mode" && pic_mode=default - -# Use C for the default configuration in the libtool script -tagname= -AC_LIBTOOL_LANG_C_CONFIG -_LT_AC_TAGCONFIG -])# AC_LIBTOOL_SETUP - - -# _LT_AC_SYS_COMPILER -# ------------------- -AC_DEFUN([_LT_AC_SYS_COMPILER], -[AC_REQUIRE([AC_PROG_CC])dnl - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# Allow CC to be a program name with arguments. -compiler=$CC -])# _LT_AC_SYS_COMPILER - - -# _LT_AC_SYS_LIBPATH_AIX -# ---------------------- -# Links a minimal program and checks the executable -# for the system default hardcoded library path. In most cases, -# this is /usr/lib:/lib, but when the MPI compilers are used -# the location of the communication and MPI libs are included too. -# If we don't find anything, use the default library path according -# to the aix ld manual. -AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX], -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi],[]) -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -])# _LT_AC_SYS_LIBPATH_AIX - - -# _LT_AC_SHELL_INIT(ARG) -# ---------------------- -AC_DEFUN([_LT_AC_SHELL_INIT], -[ifdef([AC_DIVERSION_NOTICE], - [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], - [AC_DIVERT_PUSH(NOTICE)]) -$1 -AC_DIVERT_POP -])# _LT_AC_SHELL_INIT - - -# _LT_AC_PROG_ECHO_BACKSLASH -# -------------------------- -# Add some code to the start of the generated configure script which -# will find an echo command which doesn't interpret backslashes. -AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH], -[_LT_AC_SHELL_INIT([ -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` - ;; -esac - -echo=${ECHO-echo} -if test "X[$]1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X[$]1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -fi - -if test "X[$]1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null && - echo_test_string="`eval $cmd`" && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL [$]0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL [$]0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "[$]0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -fi - -AC_SUBST(ECHO) -])])# _LT_AC_PROG_ECHO_BACKSLASH - - -# _LT_AC_LOCK -# ----------- -AC_DEFUN([_LT_AC_LOCK], -[AC_ARG_ENABLE([libtool-lock], - [AC_HELP_STRING([--disable-libtool-lock], - [avoid locking (might break parallel builds)])]) -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in - *32-bit*) - case $host in - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_LANG_PUSH(C) - AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) - AC_LANG_POP]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; -AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw* | *-*-pw32*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; - ]) -esac - -need_locks="$enable_libtool_lock" - -])# _LT_AC_LOCK - - -# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -# ---------------------------------------------------------------- -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], -[AC_REQUIRE([LT_AC_PROG_SED]) -AC_CACHE_CHECK([$1], [$2], - [$2=no - ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$3" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&AS_MESSAGE_LOG_FD - 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 - $2=yes - fi - fi - $rm conftest* -]) - -if test x"[$]$2" = xyes; then - ifelse([$5], , :, [$5]) -else - ifelse([$6], , :, [$6]) -fi -])# AC_LIBTOOL_COMPILER_OPTION - - -# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -# [ACTION-SUCCESS], [ACTION-FAILURE]) -# ------------------------------------------------------------ -# Check whether the given compiler option works -AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], -[AC_CACHE_CHECK([$1], [$2], - [$2=no - save_LDFLAGS="$LDFLAGS" - 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 - # 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 - else - $2=yes - fi - fi - $rm conftest* - LDFLAGS="$save_LDFLAGS" -]) - -if test x"[$]$2" = xyes; then - ifelse([$4], , :, [$4]) -else - ifelse([$5], , :, [$5]) -fi -])# AC_LIBTOOL_LINKER_OPTION - - -# AC_LIBTOOL_SYS_MAX_CMD_LEN -# -------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], -[# find the maximum length of command line arguments -AC_MSG_CHECKING([the maximum length of command line arguments]) -AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - *) - # 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` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - ;; - esac -]) -if test -n $lt_cv_sys_max_cmd_len ; then - AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -else - AC_MSG_RESULT(none) -fi -])# AC_LIBTOOL_SYS_MAX_CMD_LEN - - -# _LT_AC_CHECK_DLFCN -# -------------------- -AC_DEFUN([_LT_AC_CHECK_DLFCN], -[AC_CHECK_HEADERS(dlfcn.h)dnl -])# _LT_AC_CHECK_DLFCN - - -# _LT_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 : - [$4] -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - exit (status); -}] -EOF - if AC_TRY_EVAL(ac_link) && 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) $1 ;; - x$lt_dlneed_uscore) $2 ;; - x$lt_unknown|x*) $3 ;; - esac - else : - # compilation failed - $3 - fi -fi -rm -fr conftest* -])# _LT_AC_TRY_DLOPEN_SELF - - -# AC_LIBTOOL_DLOPEN_SELF -# ------------------- -AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], -[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl -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 - AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ - lt_cv_dlopen="dyld" - lt_cv_dlopen_libs= - lt_cv_dlopen_self=yes - ]) - ;; - - *) - AC_CHECK_FUNC([shl_load], - [lt_cv_dlopen="shl_load"], - [AC_CHECK_LIB([dld], [shl_load], - [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"], - [AC_CHECK_FUNC([dlopen], - [lt_cv_dlopen="dlopen"], - [AC_CHECK_LIB([dl], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], - [AC_CHECK_LIB([svld], [dlopen], - [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], - [AC_CHECK_LIB([dld], [dld_link], - [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"]) - ]) - ]) - ]) - ]) - ]) - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - AC_CACHE_CHECK([whether a program can dlopen itself], - lt_cv_dlopen_self, [dnl - _LT_AC_TRY_DLOPEN_SELF( - lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, - lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) - ]) - - if test "x$lt_cv_dlopen_self" = xyes; then - LDFLAGS="$LDFLAGS $link_static_flag" - AC_CACHE_CHECK([whether a statically linked program can dlopen itself], - lt_cv_dlopen_self_static, [dnl - _LT_AC_TRY_DLOPEN_SELF( - lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, - lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) - ]) - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi -])# AC_LIBTOOL_DLOPEN_SELF - - -# AC_LIBTOOL_PROG_CC_C_O([TAGNAME]) -# --------------------------------- -# Check to see if options -c and -o are simultaneously supported by compiler -AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl -AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)], - [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ - -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&AS_MESSAGE_LOG_FD - echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD - 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 - _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes - fi - fi - chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* -]) -])# AC_LIBTOOL_PROG_CC_C_O - - -# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME]) -# ----------------------------------------- -# Check to see if we can do hard links to lock some files if needed -AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], -[AC_REQUIRE([_LT_AC_LOCK])dnl - -hard_links="nottested" -if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - AC_MSG_CHECKING([if we can lock with hard links]) - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - AC_MSG_RESULT([$hard_links]) - if test "$hard_links" = no; then - AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) - need_locks=warn - fi -else - need_locks=no -fi -])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS - - -# AC_LIBTOOL_OBJDIR -# ----------------- -AC_DEFUN([AC_LIBTOOL_OBJDIR], -[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -[rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null]) -objdir=$lt_cv_objdir -])# AC_LIBTOOL_OBJDIR - - -# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME]) -# ---------------------------------------------- -# Check hardcoding attributes. -AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], -[AC_MSG_CHECKING([how to hardcode library paths into programs]) -_LT_AC_TAGVAR(hardcode_action, $1)= -if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \ - test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \ - test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no && - test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then - # Linking always hardcodes the temporary library directory. - _LT_AC_TAGVAR(hardcode_action, $1)=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - _LT_AC_TAGVAR(hardcode_action, $1)=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - _LT_AC_TAGVAR(hardcode_action, $1)=unsupported -fi -AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)]) - -if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = 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 -])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH - - -# AC_LIBTOOL_SYS_LIB_STRIP -# ------------------------ -AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP], -[striplib= -old_striplib= -AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) -fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac -fi -])# AC_LIBTOOL_SYS_LIB_STRIP - - -# AC_LIBTOOL_SYS_DYNAMIC_LINKER -# ----------------------------- -# PORTME Fill in your ld.so characteristics -AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER], -[AC_MSG_CHECKING([dynamic linker characteristics]) -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - 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 -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix4* | aix5*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[[01]] | aix4.[[01]].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -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 -AC_MSG_RESULT([$dynamic_linker]) -test "$dynamic_linker" = no && can_build_shared=no -])# AC_LIBTOOL_SYS_DYNAMIC_LINKER - - -# _LT_AC_TAGCONFIG -# ---------------- -AC_DEFUN([_LT_AC_TAGCONFIG], -[AC_ARG_WITH([tags], - [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@], - [include additional configurations @<:@automatic@:>@])], - [tagnames="$withval"]) - -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - AC_MSG_WARN([output file `$ofile' does not exist]) - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - AC_MSG_WARN([output file `$ofile' does not look like a libtool script]) - else - AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile']) - fi - fi - - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in - "") ;; - *) AC_MSG_ERROR([invalid tag name: $tagname]) - ;; - esac - - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - AC_MSG_ERROR([tag name \"$tagname\" already exists]) - fi - - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - if test -n "$CXX" && test "X$CXX" != "Xno"; then - AC_LIBTOOL_LANG_CXX_CONFIG - else - tagname="" - fi - ;; - - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - AC_LIBTOOL_LANG_F77_CONFIG - else - tagname="" - fi - ;; - - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - AC_LIBTOOL_LANG_GCJ_CONFIG - else - tagname="" - fi - ;; - - RC) - AC_LIBTOOL_LANG_RC_CONFIG - ;; - - *) - AC_MSG_ERROR([Unsupported tag name: $tagname]) - ;; - esac - - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" - - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - AC_MSG_ERROR([unable to update list of available tagged configurations.]) - fi -fi -])# _LT_AC_TAGCONFIG - - -# AC_LIBTOOL_DLOPEN -# ----------------- -# enable checks for dlopen support -AC_DEFUN([AC_LIBTOOL_DLOPEN], - [AC_BEFORE([$0],[AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_DLOPEN - - -# AC_LIBTOOL_WIN32_DLL -# -------------------- -# declare package support for building win32 dll's -AC_DEFUN([AC_LIBTOOL_WIN32_DLL], -[AC_BEFORE([$0], [AC_LIBTOOL_SETUP]) -])# AC_LIBTOOL_WIN32_DLL - - -# AC_ENABLE_SHARED([DEFAULT]) -# --------------------------- -# implement the --enable-shared flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_SHARED], -[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([shared], - [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@], - [build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_shared=]AC_ENABLE_SHARED_DEFAULT) -])# AC_ENABLE_SHARED - - -# AC_DISABLE_SHARED -# ----------------- -#- set the default shared flag to --disable-shared -AC_DEFUN([AC_DISABLE_SHARED], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no) -])# AC_DISABLE_SHARED - - -# AC_ENABLE_STATIC([DEFAULT]) -# --------------------------- -# implement the --enable-static flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_STATIC], -[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([static], - [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@], - [build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_static=]AC_ENABLE_STATIC_DEFAULT) -])# AC_ENABLE_STATIC - - -# AC_DISABLE_STATIC -# ----------------- -# set the default static flag to --disable-static -AC_DEFUN([AC_DISABLE_STATIC], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no) -])# AC_DISABLE_STATIC - - -# AC_ENABLE_FAST_INSTALL([DEFAULT]) -# --------------------------------- -# implement the --enable-fast-install flag -# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -AC_DEFUN([AC_ENABLE_FAST_INSTALL], -[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE([fast-install], - [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], - [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], - [p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac], - [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT) -])# AC_ENABLE_FAST_INSTALL - - -# AC_DISABLE_FAST_INSTALL -# ----------------------- -# set the default to --disable-fast-install -AC_DEFUN([AC_DISABLE_FAST_INSTALL], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no) -])# AC_DISABLE_FAST_INSTALL - - -# AC_LIBTOOL_PICMODE([MODE]) -# -------------------------- -# implement the --with-pic flag -# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -AC_DEFUN([AC_LIBTOOL_PICMODE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -pic_mode=ifelse($#,1,$1,default) -])# AC_LIBTOOL_PICMODE - - -# AC_PROG_EGREP -# ------------- -# This is predefined starting with Autoconf 2.54, so this conditional -# definition can be removed once we require Autoconf 2.54 or later. -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP], -[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep], - [if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi]) - EGREP=$ac_cv_prog_egrep - AC_SUBST([EGREP]) -])]) - - -# AC_PATH_TOOL_PREFIX -# ------------------- -# find a file program which can recognise shared library -AC_DEFUN([AC_PATH_TOOL_PREFIX], -[AC_REQUIRE([AC_PROG_EGREP])dnl -AC_MSG_CHECKING([for $1]) -AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -[case $MAGIC_CMD in -[[\\/*] | ?:[\\/]*]) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -dnl $ac_dummy forces splitting on constant user-supplied paths. -dnl POSIX.2 word splitting is done only on the output of word expansions, -dnl not every word. This closes a longstanding sh security hole. - ac_dummy="ifelse([$2], , $PATH, [$2])" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$1; then - lt_cv_path_MAGIC_CMD="$ac_dir/$1" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac]) -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - AC_MSG_RESULT($MAGIC_CMD) -else - AC_MSG_RESULT(no) -fi -])# AC_PATH_TOOL_PREFIX - - -# AC_PATH_MAGIC -# ------------- -# find a file program which can recognise a shared library -AC_DEFUN([AC_PATH_MAGIC], -[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) - else - MAGIC_CMD=: - fi -fi -])# AC_PATH_MAGIC - - -# AC_PROG_LD -# ---------- -# find the pathname to the GNU or non-GNU linker -AC_DEFUN([AC_PROG_LD], -[AC_ARG_WITH([gnu-ld], - [AC_HELP_STRING([--with-gnu-ld], - [assume the C compiler uses GNU ld @<:@default=no@:>@])], - [test "$withval" = no || with_gnu_ld=yes], - [with_gnu_ld=no]) -AC_REQUIRE([LT_AC_PROG_SED])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by $CC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]]* | ?:[[\\/]]*) - re_direlt='/[[^/]][[^/]]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(lt_cv_path_LD, -[if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &1 /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_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case "$host_cpu" in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux*) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -nto-qnx*) - lt_cv_deplibs_check_method=unknown - ;; - -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' - else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' - fi - ;; - -osf3* | osf4* | osf5*) - 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*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; -esac -]) -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown -])# AC_DEPLIBS_CHECK_METHOD - - -# AC_PROG_NM -# ---------- -# find the pathname to a BSD-compatible name lister -AC_DEFUN([AC_PROG_NM], -[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM, -[if test -n "$NM"; then - # 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" - 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 - fi - done - IFS="$lt_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi]) -NM="$lt_cv_path_NM" -])# AC_PROG_NM - - -# AC_CHECK_LIBM -# ------------- -# check for math library -AC_DEFUN([AC_CHECK_LIBM], -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case $host in -*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) - # These system don't have libm, or don't need it - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, cos, LIBM="-lm") - ;; -esac -])# AC_CHECK_LIBM - - -# AC_LIBLTDL_CONVENIENCE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl convenience library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-convenience to the configure arguments. Note that 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. -AC_DEFUN([AC_LIBLTDL_CONVENIENCE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case $enable_ltdl_convenience in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_CONVENIENCE - - -# AC_LIBLTDL_INSTALLABLE([DIRECTORY]) -# ----------------------------------- -# sets LIBLTDL to the link flags for the libltdl installable library and -# LTDLINCL to the include flags for the libltdl header and adds -# --enable-ltdl-install to the configure arguments. Note that 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. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN([AC_LIBLTDL_INSTALLABLE], -[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, lt_dlinit, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - LTDLINCL= - fi - # For backwards non-gettext consistent compatibility... - INCLTDL="$LTDLINCL" -])# AC_LIBLTDL_INSTALLABLE - - -# AC_LIBTOOL_CXX -# -------------- -# enable support for C++ libraries -AC_DEFUN([AC_LIBTOOL_CXX], -[AC_REQUIRE([_LT_AC_LANG_CXX]) -])# AC_LIBTOOL_CXX - - -# _LT_AC_LANG_CXX -# --------------- -AC_DEFUN([_LT_AC_LANG_CXX], -[AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX]) -])# _LT_AC_LANG_CXX - - -# AC_LIBTOOL_F77 -# -------------- -# enable support for Fortran 77 libraries -AC_DEFUN([AC_LIBTOOL_F77], -[AC_REQUIRE([_LT_AC_LANG_F77]) -])# AC_LIBTOOL_F77 - - -# _LT_AC_LANG_F77 -# --------------- -AC_DEFUN([_LT_AC_LANG_F77], -[AC_REQUIRE([AC_PROG_F77]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77]) -])# _LT_AC_LANG_F77 - - -# AC_LIBTOOL_GCJ -# -------------- -# enable support for GCJ libraries -AC_DEFUN([AC_LIBTOOL_GCJ], -[AC_REQUIRE([_LT_AC_LANG_GCJ]) -])# AC_LIBTOOL_GCJ - - -# _LT_AC_LANG_GCJ -# --------------- -AC_DEFUN([_LT_AC_LANG_GCJ], -[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[], - [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[], - [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])], - [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])], - [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ]) -])# _LT_AC_LANG_GCJ - - -# AC_LIBTOOL_RC -# -------------- -# enable support for Windows resource files -AC_DEFUN([AC_LIBTOOL_RC], -[AC_REQUIRE([LT_AC_PROG_RC]) -_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC]) -])# AC_LIBTOOL_RC - - -# AC_LIBTOOL_LANG_C_CONFIG -# ------------------------ -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG]) -AC_DEFUN([_LT_AC_LANG_C_CONFIG], -[lt_save_CC="$CC" -AC_LANG_PUSH(C) - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" - -# Code to be used in simple link tests -lt_simple_link_test_code='int main(){return(0);}\n' - -_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)=]) - - -AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) - -# Report which librarie types wil actually be built -AC_MSG_CHECKING([if libtool supports shared libraries]) -AC_MSG_RESULT([$can_build_shared]) - -AC_MSG_CHECKING([whether to build shared libraries]) -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case "$host_os" in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - -aix4* | aix5*) - 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]) - -AC_MSG_CHECKING([whether to build static libraries]) -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -AC_MSG_RESULT([$enable_static]) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC="$lt_save_CC" -])# AC_LIBTOOL_LANG_C_CONFIG - - -# AC_LIBTOOL_LANG_CXX_CONFIG -# -------------------------- -# Ensure that the configuration vars for the C compiler are -# suitably defined. Those variables are subsequently used by -# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'. -AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)]) -AC_DEFUN([_LT_AC_LANG_CXX_CONFIG], -[AC_LANG_PUSH(C++) -AC_REQUIRE([AC_PROG_CXX]) -AC_REQUIRE([AC_PROG_CXXCPP]) - -_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no -_LT_AC_TAGVAR(allow_undefined_flag, $1)= -_LT_AC_TAGVAR(always_export_symbols, $1)=no -_LT_AC_TAGVAR(archive_expsym_cmds, $1)= -_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_direct, $1)=no -_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -_LT_AC_TAGVAR(hardcode_libdir_separator, $1)= -_LT_AC_TAGVAR(hardcode_minus_L, $1)=no -_LT_AC_TAGVAR(hardcode_automatic, $1)=no -_LT_AC_TAGVAR(module_cmds, $1)= -_LT_AC_TAGVAR(module_expsym_cmds, $1)= -_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown -_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -_LT_AC_TAGVAR(no_undefined_flag, $1)= -_LT_AC_TAGVAR(whole_archive_flag_spec, $1)= -_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - -# Dependencies to place before and after the object being linked: -_LT_AC_TAGVAR(predep_objects, $1)= -_LT_AC_TAGVAR(postdep_objects, $1)= -_LT_AC_TAGVAR(predeps, $1)= -_LT_AC_TAGVAR(postdeps, $1)= -_LT_AC_TAGVAR(compiler_lib_search_path, $1)= - -# Source file extension for C++ test sources. -ac_ext=cc - -# Object file extension for compiled C++ test sources. -objext=o -_LT_AC_TAGVAR(objext, $1)=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" - -# Code to be used in simple link tests -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 - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_LD=$LD -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -else - 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 -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%^.*/%%'` - -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -else - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -fi - -if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - AC_PROG_LD - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - _LT_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 - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -else - GXX=no - with_gnu_ld=no - wlarc= -fi - -# PORTME: fill in a description of your system's C++ link characteristics -AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -_LT_AC_TAGVAR(ld_shlibs, $1)=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GXX" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $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" - 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" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # -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(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' - fi - fi - ;; - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - 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 - ;; - 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++) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - ghcx) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - freebsd[12]*) - # C++ shared libraries reported to be fairly broken before switch to ELF - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - freebsd-elf*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - freebsd* | kfreebsd*-gnu) - # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - ;; - gnu*) - ;; - hpux9*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - aCC) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - 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_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*) - _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 - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - _LT_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' - ;; - *) - _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' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case "$host_cpu" in - ia64*|hppa*64*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' - ;; - *) - _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' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - irix5* | irix6*) - case $cc_basename in - CC) - # SGI C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - 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' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - esac - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - linux*) - case $cc_basename in - KCC) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc) - # Intel C++ - with_gnu_ld=yes - _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) - # Compaq C++ - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - m88k*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - mvs*) - case $cc_basename in - cxx) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - osf3*) - case $cc_basename in - KCC) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' - - ;; - RCC) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' - ;; - RCC) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - cxx) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${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~ - $rm $lib.exp' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - 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(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - sco*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - case $cc_basename in - CC) - # 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) - # Lucid - # 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 - ;; - solaris*) - case $cc_basename in - CC) - # Sun C++ 4.2, 5.x and Centerline C++ - _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_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' - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) - # The C++ compiler is used as linker so we must use $wl - # flag to pass the commands to the underlying system - # linker. - # 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' - ;; - 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' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' - ;; - gcx) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - fi - - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' - fi - ;; - esac - ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*) - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - ;; - tandem*) - case $cc_basename in - NCC) - # NonStop-UX NCC 3.20 - # 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 - ;; - vxworks*) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - *) - # FIXME: insert proper C++ library support - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; -esac -AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)]) -test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no - -_LT_AC_TAGVAR(GCC, $1)="$GXX" -_LT_AC_TAGVAR(LD, $1)="$LD" - -AC_LIBTOOL_POSTDEP_PREDEP($1) -AC_LIBTOOL_PROG_COMPILER_PIC($1) -AC_LIBTOOL_PROG_CC_C_O($1) -AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1) -AC_LIBTOOL_PROG_LD_SHLIBS($1) -AC_LIBTOOL_SYS_DYNAMIC_LINKER($1) -AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1) -AC_LIBTOOL_SYS_LIB_STRIP -AC_LIBTOOL_DLOPEN_SELF($1) - -AC_LIBTOOL_CONFIG($1) - -AC_LANG_POP -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -])# AC_LIBTOOL_LANG_CXX_CONFIG - -# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME]) -# ------------------------ -# Figure out "hidden" library dependencies from verbose -# compiler output when linking a shared library. -# Parse the compiler output and extract the necessary -# objects, libraries and library flags. -AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[ -dnl we can't use the lt_simple_compile_test_code here, -dnl because it contains code intended for an executable, -dnl not a library. It's possible we should let each -dnl tag define a new lt_????_link_test_code variable, -dnl but it's only used here... -ifelse([$1],[],[cat > conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext < conftest.$ac_ext <> "$cfgfile" -ifelse([$1], [], -[#! $SHELL - -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e s/^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 - -# The names of the tagged configurations supported by this script. -available_tags= - -# ### BEGIN LIBTOOL CONFIG], -[# ### BEGIN LIBTOOL TAG CONFIG: $tagname]) - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1) - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# A language-specific compiler. -CC=$lt_[]_LT_AC_TAGVAR(compiler, $1) - -# Is the compiler the GNU C compiler? -with_gcc=$_LT_AC_TAGVAR(GCC, $1) - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_[]_LT_AC_TAGVAR(LD, $1) - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - -# 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_AC_TAGVAR(lt_prog_compiler_pic, $1) -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_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) - -# 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_AC_TAGVAR(lt_prog_compiler_static, $1) - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1) - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1) - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1) - -# 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_[]_LT_AC_TAGVAR(old_archive_cmds, $1) -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_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1) - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) - -# Commands used to build and install a shared archive. -archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1) -archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1) -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1) -module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1) - -# 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_[]_LT_AC_TAGVAR(predep_objects, $1) - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1) - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1) - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1) - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1) - -# 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_[]_LT_AC_TAGVAR(allow_undefined_flag, $1) - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1) - -# 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=$_LT_AC_TAGVAR(hardcode_action, $1) - -# 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_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1) - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1) - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1) - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1) - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1) - -# 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=$_LT_AC_TAGVAR(link_all_deplibs, $1) - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)" - -# Set to yes if exported symbols are required. -always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1) - -# The commands to list exported symbols. -export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1) - -# 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_[]_LT_AC_TAGVAR(exclude_expsyms, $1) - -# Symbols that must always be exported. -include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1) - -ifelse([$1],[], -[# ### END LIBTOOL CONFIG], -[# ### END LIBTOOL TAG CONFIG: $tagname]) - -__EOF__ - -ifelse([$1],[], [ - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" - -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" -]) -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi -])# AC_LIBTOOL_CONFIG - - -# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME]) -# ------------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl - -_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= - -if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' - - AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], - lt_cv_prog_compiler_rtti_exceptions, - [-fno-rtti -fno-exceptions], [], - [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -fi -])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI - - -# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE -# --------------------------------- -AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], -[AC_REQUIRE([AC_CANONICAL_HOST]) -AC_REQUIRE([AC_PROG_NM]) -AC_REQUIRE([AC_OBJEXT]) -# Check for command to grab the raw symbol name followed by C symbol from nm. -AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -[ -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[[BCDEGRST]]' - -# 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'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[[BCDT]]' - ;; -cygwin* | mingw* | pw32*) - symcode='[[ABCDGISTW]]' - ;; -hpux*) # Its linker distinguishes data from code symbols - if test "$host_cpu" = ia64; then - symcode='[[ABCDEGRST]]' - fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -irix* | nonstopux*) - symcode='[[BCDEGRST]]' - ;; -osf*) - symcode='[[BCDEGQRST]]' - ;; -solaris* | sysv5*) - symcode='[[BDRT]]' - ;; -sysv4) - symcode='[[DFNSTU]]' - ;; -esac - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[[ABCDGIRSTW]]' ;; -esac - -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do - - # 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'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext < $nlist) && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[[]] = -{ -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" - if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD - fi - else - echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD - cat conftest.$ac_ext >&5 - fi - rm -f conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done -]) -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - AC_MSG_RESULT(failed) -else - AC_MSG_RESULT(ok) -fi -]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE - - -# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME]) -# --------------------------------------- -AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC], -[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= -_LT_AC_TAGVAR(lt_prog_compiler_static, $1)= - -AC_MSG_CHECKING([for $compiler option to produce PIC]) - ifelse([$1],[CXX],[ - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - case $host_os in - aix4* | aix5*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - ghcx) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | kfreebsd*-gnu) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - fi - ;; - aCC) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux*) - case $cc_basename in - KCC) - # KAI C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - icpc) - # 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) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' - ;; - RCC) - # Rational C++ 2.4.1 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - cxx) - # Digital/Compaq C++ - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - sco*) - case $cc_basename in - CC) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - *) - ;; - esac - ;; - solaris*) - case $cc_basename in - CC) - # Sun C++ 4.2, 5.x and Centerline C++ - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - ;; - gcx) - # Green Hills C++ Compiler - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC) - # Sun C++ 4.x - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - lcc) - # Lucid - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC) - # NonStop-UX NCC 3.20 - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - ;; - *) - ;; - esac - ;; - unixware*) - ;; - vxworks*) - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -], -[ - if test "$GCC" = yes; then - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic - fi - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - ;; - - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - else - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # PIC (with -KPIC) is the default. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - newsos6) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - linux*) - case $CC 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' - ;; - ccc*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All Alpha code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - esac - ;; - - osf3* | osf4* | osf5*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' - # All OSF/1 code is PIC. - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' - ;; - - 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' - ;; - - sunos4*) - _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - _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' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - fi - ;; - - uts4*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic' - _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' - ;; - - *) - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no - ;; - esac - fi -]) -AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)]) - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then - AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works], - _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1), - [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [], - [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in - "" | " "*) ;; - *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;; - esac], - [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -fi -case "$host_os" in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)= - ;; - *) - _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])" - ;; -esac -]) - - -# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME]) -# ------------------------------------ -# See if the linker supports building shared libraries. -AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS], -[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -ifelse([$1],[CXX],[ - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix4* | aix5*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" - ;; - cygwin* | mingw*) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols' - ;; - linux*) - _LT_AC_TAGVAR(link_all_deplibs, $1)=no - ;; - *) - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac -],[ - runpath_var= - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no - _LT_AC_TAGVAR(archive_cmds, $1)= - _LT_AC_TAGVAR(archive_expsym_cmds, $1)= - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)= - _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)= - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)= - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)= - _LT_AC_TAGVAR(thread_safe_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - _LT_AC_TAGVAR(hardcode_direct, $1)=no - _LT_AC_TAGVAR(hardcode_minus_L, $1)=no - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported - _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown - _LT_AC_TAGVAR(hardcode_automatic, $1)=no - _LT_AC_TAGVAR(module_cmds, $1)= - _LT_AC_TAGVAR(module_expsym_cmds, $1)= - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - _LT_AC_TAGVAR(include_expsyms, $1)= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_" - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, - # as there is no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=no - _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /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' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - else - ld_shlibs=no - fi - ;; - - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris* | sysv5*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - _LT_AC_TAGVAR(ld_shlibs, $1)=no - cat <&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - - sunos4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - 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' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - _LT_AC_TAGVAR(ld_shlibs, $1)=no - fi - ;; - esac - - 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 - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - fi - ;; - - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - else - _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - _LT_AC_TAGVAR(archive_cmds, $1)='' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':' - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - - if test "$GCC" = yes; then - case $host_os in aix4.[012]|aix4.[012].*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - else - # We have old collect2 - _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)= - fi - esac - shared_flag='-shared' - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - _LT_AC_TAGVAR(always_export_symbols, $1)=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok' - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $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" - 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" - else - # Determine the default libpath from the value encoded in an empty executable. - _LT_AC_SYS_LIBPATH_AIX - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' - # -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(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' - fi - fi - ;; - - amigaos*) - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - # see comment about different semantics on the GNU ld section - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - bsdi4*) - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true' - # FIXME: Should let the user specify the lib program. - _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`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 - ;; - 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*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - freebsd1*) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | 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 - ;; - - hpux9*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - ;; - - hpux10* | hpux11*) - 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 ${wl}+h ${wl}$soname -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' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_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_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' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - newsos6) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - openbsd*) - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' - else - case $host_os in - openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - ;; - *) - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' - ;; - esac - fi - ;; - - os2*) - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported - _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' - else - _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${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' - fi - _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 - _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 - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - case $host_os in - solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;; - esac - _LT_AC_TAGVAR(link_all_deplibs, $1)=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes - _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4) - case $host_vendor in - sni) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' - _LT_AC_TAGVAR(hardcode_direct, $1)=no - ;; - motorola) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - sysv4.3*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - _LT_AC_TAGVAR(ld_shlibs, $1)=yes - fi - ;; - - 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 - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - hardcode_runpath_var=yes - 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' - else - _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$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)= - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - runpath_var='LD_RUN_PATH' - ;; - - uts4*) - _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' - _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no - ;; - - *) - _LT_AC_TAGVAR(ld_shlibs, $1)=no - ;; - esac - fi -]) -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? -# -case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in -x|xyes) - # Assume -lc should be added - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $_LT_AC_TAGVAR(archive_cmds, $1) in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - AC_MSG_CHECKING([whether -lc should be explicitly linked in]) - $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - if AC_TRY_EVAL(ac_compile) 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1) - _LT_AC_TAGVAR(allow_undefined_flag, $1)= - if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) - then - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no - else - _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes - fi - _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)]) - ;; - esac - fi - ;; -esac -])# AC_LIBTOOL_PROG_LD_SHLIBS - - -# _LT_AC_FILE_LTDLL_C -# ------------------- -# Be careful that the start marker always follows a newline. -AC_DEFUN([_LT_AC_FILE_LTDLL_C], [ -# /* ltdll.c starts here */ -# #define WIN32_LEAN_AND_MEAN -# #include -# #undef WIN32_LEAN_AND_MEAN -# #include -# -# #ifndef __CYGWIN__ -# # ifdef __CYGWIN32__ -# # define __CYGWIN__ __CYGWIN32__ -# # endif -# #endif -# -# #ifdef __cplusplus -# extern "C" { -# #endif -# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved); -# #ifdef __cplusplus -# } -# #endif -# -# #ifdef __CYGWIN__ -# #include -# DECLARE_CYGWIN_DLL( DllMain ); -# #endif -# HINSTANCE __hDllInstance_base; -# -# BOOL APIENTRY -# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved) -# { -# __hDllInstance_base = hInst; -# return TRUE; -# } -# /* ltdll.c ends here */ -])# _LT_AC_FILE_LTDLL_C - - -# _LT_AC_TAGVAR(VARNAME, [TAGNAME]) -# --------------------------------- -AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])]) - - -# old names -AC_DEFUN([AM_PROG_LIBTOOL], [AC_PROG_LIBTOOL]) -AC_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -AC_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -AC_DEFUN([AM_PROG_LD], [AC_PROG_LD]) -AC_DEFUN([AM_PROG_NM], [AC_PROG_NM]) - -# This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL]) - -AC_DEFUN([LT_AC_PROG_GCJ], -[AC_CHECK_TOOL(GCJ, gcj, no) - test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" - AC_SUBST(GCJFLAGS) -]) - -AC_DEFUN([LT_AC_PROG_RC], -[AC_CHECK_TOOL(RC, windres, no) -]) - -# NOTE: This macro has been submitted for inclusion into # -# GNU Autoconf as AC_PROG_SED. When it is available in # -# a released version of Autoconf we should remove this # -# macro and use it instead. # -# LT_AC_PROG_SED -# -------------- -# Check for a fully-functional sed program, that truncates -# as few characters as possible. Prefer GNU sed if found. -AC_DEFUN([LT_AC_PROG_SED], -[AC_MSG_CHECKING([for a sed that does not truncate output]) -AC_CACHE_VAL(lt_cv_path_SED, -[# Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -SED=$lt_cv_path_SED -]) -AC_MSG_RESULT([$SED]) -]) - -# Like AC_CONFIG_HEADER, but automatically create stamp file. - -AC_DEFUN([AM_CONFIG_HEADER], -[AC_PREREQ([2.12]) -AC_CONFIG_HEADER([$1]) -dnl When config.status generates a header, we must update the stamp-h file. -dnl This file resides in the same directory as the config header -dnl that is generated. We must strip everything past the first ":", -dnl and everything past the last "/". -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -<>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -<>; do - case " <<$>>CONFIG_HEADERS " in - *" <<$>>am_file "*<<)>> - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx - ;; - esac - am_indx=`expr "<<$>>am_indx" + 1` -done<<>>dnl>>) -changequote([,]))]) - -# isc-posix.m4 serial 2 (gettext-0.11.2) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. - -# This test replaces the one in autoconf. -# Currently this macro should have the same name as the autoconf macro -# because gettext's gettext.m4 (distributed in the automake package) -# still uses it. Otherwise, the use in gettext.m4 makes autoheader -# give these diagnostics: -# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX -# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX - -undefine([AC_ISC_POSIX]) - -AC_DEFUN([AC_ISC_POSIX], - [ - dnl This test replaces the obsolescent AC_ISC_POSIX kludge. - AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) - ] -) - diff -Naur WindowMaker-0.91.0/autogen.sh wm/autogen.sh --- WindowMaker-0.91.0/autogen.sh 1970-01-01 03:00:00 +0300 +++ wm/autogen.sh 2002-03-04 09:28:14 +0300 @@ -0,0 +1,58 @@ +#!/bin/sh +# Run this to generate all the initial makefiles, etc. + +DIE=0 + +echo "Generating configuration files for WindowMaker, please wait...." + +(autoconf --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have autoconf installed to compile WindowMaker." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(libtool --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have libtool installed to compile WindowMaker." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +(automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have automake installed to compile WindowMaker." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/" + DIE=1 +} + +if test "$DIE" -eq 1; then + exit 1 +fi + +echo " libtoolize --copy --force --automake" +libtoolize --copy --force --automake +echo " aclocal -I . $ACLOCAL_FLAGS" +aclocal -I . $ACLOCAL_FLAGS +echo " autoheader" +autoheader +echo " automake --add-missing --gnu --include-deps" +automake --add-missing --gnu --include-deps +echo " autoconf" +autoconf + +if [ -x config.status -a -z "$*" ]; then + ./config.status --recheck +else + if test -z "$*"; then + echo "I am going to run ./configure with no arguments - if you wish " + echo "to pass any to it, please specify them on the $0 command line." + echo "If you do not wish to run ./configure, press Ctrl-C now." + trap 'echo "configure aborted" ; exit 0' 1 2 15 + sleep 1 + fi + ./configure "$@" +fi diff -Naur WindowMaker-0.91.0/ChangeLog wm/ChangeLog --- WindowMaker-0.91.0/ChangeLog 2004-10-26 08:09:57 +0400 +++ wm/ChangeLog 2005-05-15 20:45:02 +0400 @@ -1,3 +1,33 @@ +Changes since version 0.91.0: +............................. + +- fixed crash with info panel and alt-tabbing +- updated Japanese translations (Takeo Hashimoto ) +- allow disable of switch panel when SwitchPanelImages=None +- added X Input Methods support in WINGs +- fixed issues with compiling on Solaris with openwin +- reduced minimum required version number for the Xft library to 2.1.0 +- fixed some compilation issues with gcc-2.9x +- removed --with-appsdir option and replaced it with --with-gnustepdir. Also, + default installation path (for non GNUstep users) is now $(prefix)/bin +- fixed bug with infinite loop in some circumstances in fitText() in WINGs +- fixed to allow parallel builds on SMP systems using make -j +- updated Italian translation (Marco Colombo ) +- applied .AppInfo --> Library path rename patch (Alex Perez ) +- added code to automatically update the icon paths from the old .AppInfo + style to the new Library/WindowMaker style in WMWindowAttributes when + Window Maker starts to make transition transparent for users. +- fixed issue with window being moved by 1 pixel up and left when the window + move was initiated by the client +- improved hide/unhide animation for applications with multiple windows + (only animate the active window hiding/unhiding, which makes Window Maker + faster and more responsive for such applications). This also makes the + restart operation much faster. +- fixed bug with windows shrinking to very small sizes when Unmaximize was + used on them, after they were closed in a maximized state. +- fixed bug with restoring maximized state from NetWM atoms. + + Changes since version 0.90.0: ............................. diff -Naur WindowMaker-0.91.0/config.guess wm/config.guess --- WindowMaker-0.91.0/config.guess 2004-10-26 08:10:35 +0400 +++ wm/config.guess 1970-01-01 03:00:00 +0300 @@ -1,1441 +0,0 @@ -#! /bin/sh -# Attempt to guess a canonical system name. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. - -timestamp='2004-08-13' - -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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 . -# Please send patches to . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# This script attempts to guess a canonical system name similar to -# config.sub. If it succeeds, it prints the system name on stdout, and -# exits with 0. Otherwise, it exits with 1. -# -# The plan is that this can be called by configure scripts if you -# don't specify an explicit build system type. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] - -Output the configuration name of the system \`$me' is run on. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.guess ($timestamp) - -Originally written by Per Bothner. -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; - --version | -v ) - echo "$version" ; exit 0 ;; - --help | --h* | -h ) - echo "$usage"; exit 0 ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" >&2 - exit 1 ;; - * ) - break ;; - esac -done - -if test $# != 0; then - echo "$me: too many arguments$help" >&2 - exit 1 -fi - -trap 'exit 1' 1 2 15 - -# CC_FOR_BUILD -- compiler used by this script. Note that the use of a -# compiler to aid in system detection is discouraged as it requires -# temporary files to be created and, as you can see below, it is a -# headache to deal with in a portable fashion. - -# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still -# use `HOST_CC' if defined, but it is deprecated. - -# Portable tmp directory creation inspired by the Autoconf team. - -set_cc_for_build=' -trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; -: ${TMPDIR=/tmp} ; - { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; -dummy=$tmp/dummy ; -tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; -case $CC_FOR_BUILD,$HOST_CC,$CC in - ,,) echo "int x;" > $dummy.c ; - for c in cc gcc c89 c99 ; do - if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then - CC_FOR_BUILD="$c"; break ; - fi ; - done ; - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found ; - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; -esac ;' - -# This is needed to find uname on a Pyramid OSx when run in the BSD universe. -# (ghazi@noc.rutgers.edu 1994-08-24) -if (test -f /.attbin/uname) >/dev/null 2>&1 ; then - PATH=$PATH:/.attbin ; export PATH -fi - -UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown -UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown -UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown -UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown - -# Note: order is significant - the case branches are not exclusive. - -case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in - *:NetBSD:*:*) - # NetBSD (nbsd) targets should (where applicable) match one or - # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*, - # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently - # switched to ELF, *-*-netbsd* would select the old - # object file format. This provides both forward - # compatibility and a consistent mechanism for selecting the - # object file format. - # - # Note: NetBSD doesn't particularly care about the vendor - # portion of the name. We always set it to "unknown". - sysctl="sysctl -n hw.machine_arch" - UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \ - /usr/sbin/$sysctl 2>/dev/null || echo unknown)` - case "${UNAME_MACHINE_ARCH}" in - armeb) machine=armeb-unknown ;; - arm*) machine=arm-unknown ;; - sh3el) machine=shl-unknown ;; - sh3eb) machine=sh-unknown ;; - *) machine=${UNAME_MACHINE_ARCH}-unknown ;; - esac - # The Operating System including object format, if it has switched - # to ELF recently, or will in the future. - case "${UNAME_MACHINE_ARCH}" in - arm*|i386|m68k|ns32k|sh3*|sparc|vax) - eval $set_cc_for_build - if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep __ELF__ >/dev/null - then - # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). - # Return netbsd for either. FIX? - os=netbsd - else - os=netbsdelf - fi - ;; - *) - os=netbsd - ;; - esac - # The OS release - # Debian GNU/NetBSD machines have a different userland, and - # thus, need a distinct triplet. However, they do not need - # kernel version information, so it can be replaced with a - # suitable tag, in the style of linux-gnu. - case "${UNAME_VERSION}" in - Debian*) - release='-gnu' - ;; - *) - release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'` - ;; - esac - # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: - # 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 ;; - *:OpenBSD:*:*) - echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE} - exit 0 ;; - *:ekkoBSD:*:*) - echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} - exit 0 ;; - macppc:MirBSD:*:*) - echo powerppc-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; - *:MirBSD:*:*) - echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE} - exit 0 ;; - alpha:OSF1:*:*) - case $UNAME_RELEASE in - *4.0) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` - ;; - *5.*) - UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` - ;; - esac - # According to Compaq, /usr/sbin/psrinfo has been available on - # OSF/1 and Tru64 systems produced since 1995. I hope that - # covers most systems running today. This code pipes the CPU - # types through head -n 1, so we only detect the type of CPU 0. - ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` - case "$ALPHA_CPU_TYPE" in - "EV4 (21064)") - UNAME_MACHINE="alpha" ;; - "EV4.5 (21064)") - UNAME_MACHINE="alpha" ;; - "LCA4 (21066/21068)") - UNAME_MACHINE="alpha" ;; - "EV5 (21164)") - UNAME_MACHINE="alphaev5" ;; - "EV5.6 (21164A)") - UNAME_MACHINE="alphaev56" ;; - "EV5.6 (21164PC)") - UNAME_MACHINE="alphapca56" ;; - "EV5.7 (21164PC)") - UNAME_MACHINE="alphapca57" ;; - "EV6 (21264)") - UNAME_MACHINE="alphaev6" ;; - "EV6.7 (21264A)") - UNAME_MACHINE="alphaev67" ;; - "EV6.8CB (21264C)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8AL (21264B)") - UNAME_MACHINE="alphaev68" ;; - "EV6.8CX (21264D)") - UNAME_MACHINE="alphaev68" ;; - "EV6.9A (21264/EV69A)") - UNAME_MACHINE="alphaev69" ;; - "EV7 (21364)") - UNAME_MACHINE="alphaev7" ;; - "EV7.9 (21364A)") - UNAME_MACHINE="alphaev79" ;; - esac - # A Pn.n version is a patched version. - # A Vn.n version is a released version. - # A Tn.n version is a released field test version. - # 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 ;; - 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 ;; - 21064:Windows_NT:50:3) - echo alpha-dec-winnt3.5 - exit 0 ;; - Amiga*:UNIX_System_V:4.0:*) - echo m68k-unknown-sysv4 - exit 0;; - *:[Aa]miga[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-amigaos - exit 0 ;; - *:[Mm]orph[Oo][Ss]:*:*) - echo ${UNAME_MACHINE}-unknown-morphos - exit 0 ;; - *:OS/390:*:*) - echo i370-ibm-openedition - exit 0 ;; - *:OS400:*:*) - echo powerpc-ibm-os400 - exit 0 ;; - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit 0;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) - echo hppa1.1-hitachi-hiuxmpp - exit 0;; - 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 - echo pyramid-pyramid-sysv3 - else - echo pyramid-pyramid-bsd - fi - exit 0 ;; - NILE*:*:*:dcosx) - echo pyramid-pyramid-svr4 - exit 0 ;; - DRS?6000:unix:4.0:6*) - echo sparc-icl-nx6 - exit 0 ;; - DRS?6000:UNIX_SV:4.2*:7*) - case `/usr/bin/uname -p` in - sparc) echo sparc-icl-nx7 && exit 0 ;; - esac ;; - sun4H:SunOS:5.*:*) - echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) - echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - i86pc:SunOS:5.*:*) - echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - 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 ;; - sun4*:SunOS:*:*) - case "`/usr/bin/arch -k`" in - Series*|S4*) - UNAME_RELEASE=`uname -v` - ;; - 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 ;; - sun3*:SunOS:*:*) - echo m68k-sun-sunos${UNAME_RELEASE} - exit 0 ;; - 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 - case "`/bin/arch`" in - sun3) - echo m68k-sun-sunos${UNAME_RELEASE} - ;; - sun4) - echo sparc-sun-sunos${UNAME_RELEASE} - ;; - esac - exit 0 ;; - aushp:SunOS:*:*) - echo sparc-auspex-sunos${UNAME_RELEASE} - exit 0 ;; - # 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 - # > m68000). The system name ranges from "MiNT" over "FreeMiNT" - # to the lowercase version "mint" (or "freemint"). Finally - # the system name "TOS" denotes a system which is actually not - # MiNT. But MiNT is downward compatible to TOS, so this should - # be no problem. - atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) - echo m68k-atari-mint${UNAME_RELEASE} - exit 0 ;; - milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) - echo m68k-milan-mint${UNAME_RELEASE} - exit 0 ;; - hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) - echo m68k-hades-mint${UNAME_RELEASE} - exit 0 ;; - *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) - echo m68k-unknown-mint${UNAME_RELEASE} - exit 0 ;; - m68k:machten:*:*) - echo m68k-apple-machten${UNAME_RELEASE} - exit 0 ;; - powerpc:machten:*:*) - echo powerpc-apple-machten${UNAME_RELEASE} - exit 0 ;; - RISC*:Mach:*:*) - echo mips-dec-mach_bsd4.3 - exit 0 ;; - RISC*:ULTRIX:*:*) - echo mips-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - VAX*:ULTRIX*:*:*) - echo vax-dec-ultrix${UNAME_RELEASE} - exit 0 ;; - 2020:CLIX:*:* | 2430:CLIX:*:*) - echo clipper-intergraph-clix${UNAME_RELEASE} - exit 0 ;; - mips:*:*:UMIPS | mips:*:*:RISCos) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c -#ifdef __cplusplus -#include /* for printf() prototype */ - int main (int argc, char *argv[]) { -#else - int main (argc, argv) int argc; char *argv[]; { -#endif - #if defined (host_mips) && defined (MIPSEB) - #if defined (SYSTYPE_SYSV) - printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_SVR4) - printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0); - #endif - #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) - printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0); - #endif - #endif - exit (-1); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c \ - && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \ - && exit 0 - echo mips-mips-riscos${UNAME_RELEASE} - exit 0 ;; - Motorola:PowerMAX_OS:*:*) - echo powerpc-motorola-powermax - exit 0 ;; - Motorola:*:4.3:PL8-*) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*) - echo powerpc-harris-powermax - exit 0 ;; - Night_Hawk:Power_UNIX:*:*) - echo powerpc-harris-powerunix - exit 0 ;; - m88k:CX/UX:7*:*) - echo m88k-harris-cxux7 - exit 0 ;; - m88k:*:4*:R4*) - echo m88k-motorola-sysv4 - exit 0 ;; - m88k:*:3*:R3*) - echo m88k-motorola-sysv3 - exit 0 ;; - AViiON:dgux:*:*) - # DG/UX returns AViiON for all architectures - UNAME_PROCESSOR=`/usr/bin/uname -p` - if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ] - then - if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \ - [ ${TARGET_BINARY_INTERFACE}x = x ] - then - echo m88k-dg-dgux${UNAME_RELEASE} - else - echo m88k-dg-dguxbcs${UNAME_RELEASE} - fi - else - echo i586-dg-dgux${UNAME_RELEASE} - fi - exit 0 ;; - M88*:DolphinOS:*:*) # DolphinOS (SVR3) - echo m88k-dolphin-sysv3 - exit 0 ;; - M88*:*:R3*:*) - # Delta 88k system running SVR3 - echo m88k-motorola-sysv3 - exit 0 ;; - XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) - echo m88k-tektronix-sysv3 - exit 0 ;; - Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) - echo m68k-tektronix-bsd - exit 0 ;; - *:IRIX*:*:*) - echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'` - exit 0 ;; - ????????: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 ' - i*86:AIX:*:*) - echo i386-ibm-aix - exit 0 ;; - ia64:AIX:*:*) - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${UNAME_MACHINE}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:2:3) - if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - - main() - { - if (!__power_pc()) - exit(1); - puts("powerpc-ibm-aix3.2.5"); - exit(0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo rs6000-ibm-aix3.2.5 - 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 ;; - *: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 - IBM_ARCH=rs6000 - else - IBM_ARCH=powerpc - fi - if [ -x /usr/bin/oslevel ] ; then - IBM_REV=`/usr/bin/oslevel` - else - IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE} - fi - echo ${IBM_ARCH}-ibm-aix${IBM_REV} - exit 0 ;; - *:AIX:*:*) - echo rs6000-ibm-aix - exit 0 ;; - ibmrt:4.4BSD:*|romp-ibm:BSD:*) - echo romp-ibm-bsd4.4 - exit 0 ;; - 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 - *:BOSX:*:*) - echo rs6000-bull-bosx - exit 0 ;; - DPX/2?00:B.O.S.:*:*) - echo m68k-bull-sysv3 - exit 0 ;; - 9000/[34]??:4.3bsd:1.*:*) - echo m68k-hp-bsd - exit 0 ;; - hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) - echo m68k-hp-bsd4.4 - exit 0 ;; - 9000/[34678]??:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - case "${UNAME_MACHINE}" in - 9000/31? ) HP_ARCH=m68000 ;; - 9000/[34]?? ) HP_ARCH=m68k ;; - 9000/[678][0-9][0-9]) - if [ -x /usr/bin/getconf ]; then - sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` - sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` - case "${sc_cpu_version}" in - 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0 - 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1 - 532) # CPU_PA_RISC2_0 - case "${sc_kernel_bits}" in - 32) HP_ARCH="hppa2.0n" ;; - 64) HP_ARCH="hppa2.0w" ;; - '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20 - esac ;; - esac - fi - if [ "${HP_ARCH}" = "" ]; then - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - - #define _HPUX_SOURCE - #include - #include - - int main () - { - #if defined(_SC_KERNEL_BITS) - long bits = sysconf(_SC_KERNEL_BITS); - #endif - long cpu = sysconf (_SC_CPU_VERSION); - - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1"); break; - case CPU_PA_RISC2_0: - #if defined(_SC_KERNEL_BITS) - switch (bits) - { - case 64: puts ("hppa2.0w"); break; - case 32: puts ("hppa2.0n"); break; - default: puts ("hppa2.0"); break; - } break; - #else /* !defined(_SC_KERNEL_BITS) */ - puts ("hppa2.0"); break; - #endif - default: puts ("hppa1.0"); break; - } - exit (0); - } -EOF - (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy` - test -z "$HP_ARCH" && HP_ARCH=hppa - fi ;; - 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 - then - HP_ARCH="hppa2.0w" - else - HP_ARCH="hppa64" - fi - fi - echo ${HP_ARCH}-hp-hpux${HPUX_REV} - exit 0 ;; - ia64:HP-UX:*:*) - HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'` - echo ia64-hp-hpux${HPUX_REV} - exit 0 ;; - 3050*:HI-UX:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - int - main () - { - long cpu = sysconf (_SC_CPU_VERSION); - /* The order matters, because CPU_IS_HP_MC68K erroneously returns - true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct - results, however. */ - if (CPU_IS_PA_RISC (cpu)) - { - switch (cpu) - { - case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break; - case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break; - case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break; - default: puts ("hppa-hitachi-hiuxwe2"); break; - } - } - else if (CPU_IS_HP_MC68K (cpu)) - puts ("m68k-hitachi-hiuxwe2"); - else puts ("unknown-hitachi-hiuxwe2"); - exit (0); - } -EOF - $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0 - echo unknown-hitachi-hiuxwe2 - exit 0 ;; - 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* ) - echo hppa1.1-hp-bsd - exit 0 ;; - 9000/8??:4.3bsd:*:*) - echo hppa1.0-hp-bsd - exit 0 ;; - *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) - echo hppa1.0-hp-mpeix - exit 0 ;; - hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* ) - echo hppa1.1-hp-osf - exit 0 ;; - hp8??:OSF1:*:*) - echo hppa1.0-hp-osf - exit 0 ;; - i*86:OSF1:*:*) - if [ -x /usr/sbin/sysversion ] ; then - echo ${UNAME_MACHINE}-unknown-osf1mk - else - echo ${UNAME_MACHINE}-unknown-osf1 - fi - exit 0 ;; - parisc*:Lites*:*:*) - echo hppa1.1-hp-lites - exit 0 ;; - C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) - echo c1-convex-bsd - exit 0 ;; - C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*) - echo c34-convex-bsd - exit 0 ;; - C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) - echo c38-convex-bsd - exit 0 ;; - C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) - echo c4-convex-bsd - exit 0 ;; - CRAY*Y-MP:*:*:*) - echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - 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 ;; - CRAY*TS:*:*:*) - echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*T3E:*:*:*) - echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - CRAY*SV1:*:*:*) - echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - *:UNICOS/mp:*:*) - echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/' - exit 0 ;; - 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 ;; - 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 ;; - i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) - echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE} - exit 0 ;; - sparc*:BSD/OS:*:*) - echo sparc-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:BSD/OS:*:*) - echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE} - exit 0 ;; - *:FreeBSD:*:*) - echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit 0 ;; - i*:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit 0 ;; - i*:PW*:*) - echo ${UNAME_MACHINE}-pc-pw32 - exit 0 ;; - x86:Interix*:[34]*) - echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' - exit 0 ;; - [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) - echo i${UNAME_MACHINE}-pc-mks - exit 0 ;; - 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 ;; - i*:UWIN*:*) - echo ${UNAME_MACHINE}-pc-uwin - exit 0 ;; - p*:CYGWIN*:*) - echo powerpcle-unknown-cygwin - exit 0 ;; - prep*:SunOS:5.*:*) - echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit 0 ;; - *:GNU:*:*) - # the GNU system - echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'` - exit 0 ;; - *: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 ;; - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit 0 ;; - arm*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - cris:Linux:*:*) - echo cris-axis-linux-gnu - exit 0 ;; - ia64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - m32r*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - m68*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - mips:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips - #undef mipsel - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mipsel - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips - #else - CPU= - #endif - #endif -EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` - test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0 - ;; - mips64:Linux:*:*) - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #undef CPU - #undef mips64 - #undef mips64el - #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) - CPU=mips64el - #else - #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) - CPU=mips64 - #else - CPU= - #endif - #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 - ;; - ppc:Linux:*:*) - echo powerpc-unknown-linux-gnu - exit 0 ;; - ppc64:Linux:*:*) - echo powerpc64-unknown-linux-gnu - exit 0 ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; - EV56) UNAME_MACHINE=alphaev56 ;; - PCA56) UNAME_MACHINE=alphapca56 ;; - PCA57) UNAME_MACHINE=alphapca56 ;; - EV6) UNAME_MACHINE=alphaev6 ;; - EV67) UNAME_MACHINE=alphaev67 ;; - EV68*) UNAME_MACHINE=alphaev68 ;; - esac - objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null - if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi - echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC} - exit 0 ;; - parisc:Linux:*:* | hppa:Linux:*:*) - # Look for CPU level - case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in - PA7*) echo hppa1.1-unknown-linux-gnu ;; - PA8*) echo hppa2.0-unknown-linux-gnu ;; - *) echo hppa-unknown-linux-gnu ;; - esac - exit 0 ;; - parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit 0 ;; - s390:Linux:*:* | s390x:Linux:*:*) - echo ${UNAME_MACHINE}-ibm-linux - exit 0 ;; - sh64*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - sh*:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - sparc:Linux:*:* | sparc64:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-gnu - exit 0 ;; - x86_64:Linux:*:*) - echo x86_64-unknown-linux-gnu - exit 0 ;; - i*86:Linux:*:*) - # The BFD linker knows what the default object file format is, so - # first see if it will tell us. cd to the root directory to prevent - # problems with other programs or directories called `ld' in the path. - # Set LC_ALL=C to ensure ld outputs messages in English. - ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \ - | sed -ne '/supported targets:/!d - s/[ ][ ]*/ /g - s/.*supported targets: *// - s/ .*// - p'` - case "$ld_supported_targets" in - elf32-i386) - TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu" - ;; - a.out-i386-linux) - echo "${UNAME_MACHINE}-pc-linux-gnuaout" - exit 0 ;; - coff-i386) - echo "${UNAME_MACHINE}-pc-linux-gnucoff" - exit 0 ;; - "") - # 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 ;; - esac - # Determine whether the default compiler is a.out or elf - eval $set_cc_for_build - sed 's/^ //' << EOF >$dummy.c - #include - #ifdef __ELF__ - # ifdef __GLIBC__ - # if __GLIBC__ >= 2 - LIBC=gnu - # else - LIBC=gnulibc1 - # endif - # else - LIBC=gnulibc1 - # endif - #else - #ifdef __INTEL_COMPILER - LIBC=gnu - #else - LIBC=gnuaout - #endif - #endif - #ifdef __dietlibc__ - LIBC=dietlibc - #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 - ;; - 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 ;; - i*86:UNIX_SV:4.2MP:2.*) - # Unixware is an offshoot of SVR4, but it has its own version - # number series starting with 2... - # I am not positive that other SVR4 systems won't match this, - # I just have to hope. -- rms. - # Use sysv4.2uw... so that sysv4* matches it. - echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION} - exit 0 ;; - 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 ;; - i*86:XTS-300:*:STOP) - echo ${UNAME_MACHINE}-unknown-stop - exit 0 ;; - i*86:atheos:*:*) - echo ${UNAME_MACHINE}-unknown-atheos - exit 0 ;; - i*86:syllable:*:*) - echo ${UNAME_MACHINE}-pc-syllable - exit 0 ;; - i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*) - echo i386-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - i*86:*DOS:*:*) - echo ${UNAME_MACHINE}-pc-msdosdjgpp - exit 0 ;; - 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 - echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL} - else - echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL} - fi - exit 0 ;; - i*86:*:5:[78]*) - 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 ;; - i*86:*:3.2:*) - if test -f /usr/options/cb.name; then - UNAME_REL=`sed -n 's/.*Version //p' /dev/null >/dev/null ; then - UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` - (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 - (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ - && UNAME_MACHINE=i586 - (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ - && UNAME_MACHINE=i686 - (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ - && UNAME_MACHINE=i686 - echo ${UNAME_MACHINE}-pc-sco$UNAME_REL - else - echo ${UNAME_MACHINE}-pc-sysv32 - fi - exit 0 ;; - 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 ;; - Intel:Mach:3*:*) - echo i386-pc-mach3 - exit 0 ;; - paragon:*:*:*) - echo i860-intel-osf1 - exit 0 ;; - 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 ;; - mini*:CTIX:SYS*5:*) - # "miniframe" - echo m68010-convergent-sysv - exit 0 ;; - mc68k:UNIX:SYSTEM5:3.51m) - echo m68k-convergent-sysv - exit 0 ;; - M680?0:D-NIX:5.3:*) - echo m68k-diab-dnix - exit 0 ;; - M68*:*:R3V[5678]*:*) - test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;; - 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 - /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ - && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;; - 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) - /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ - && echo i486-ncr-sysv4 && exit 0 ;; - m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) - echo m68k-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - mc68030:UNIX_System_V:4.*:*) - echo m68k-atari-sysv4 - exit 0 ;; - TSUNAMI:LynxOS:2.*:*) - echo sparc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - rs6000:LynxOS:2.*:*) - echo rs6000-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*) - echo powerpc-unknown-lynxos${UNAME_RELEASE} - exit 0 ;; - SM[BE]S:UNIX_SV:*:*) - echo mips-dde-sysv${UNAME_RELEASE} - exit 0 ;; - RM*:ReliantUNIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - RM*:SINIX-*:*:*) - echo mips-sni-sysv4 - exit 0 ;; - *:SINIX-*:*:*) - if uname -p 2>/dev/null >/dev/null ; then - UNAME_MACHINE=`(uname -p) 2>/dev/null` - echo ${UNAME_MACHINE}-sni-sysv4 - else - echo ns32k-sni-sysv - fi - exit 0 ;; - PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort - # says - echo i586-unisys-sysv4 - exit 0 ;; - *:UNIX_System_V:4*:FTX*) - # From Gerald Hewes . - # How about differentiating between stratus architectures? -djm - echo hppa1.1-stratus-sysv4 - exit 0 ;; - *:*:*:FTX*) - # From seanf@swdc.stratus.com. - echo i860-stratus-sysv4 - exit 0 ;; - *:VOS:*:*) - # From Paul.Green@stratus.com. - echo hppa1.1-stratus-vos - exit 0 ;; - mc68*:A/UX:*:*) - echo m68k-apple-aux${UNAME_RELEASE} - exit 0 ;; - news*:NEWS-OS:6*:*) - echo mips-sony-newsos6 - exit 0 ;; - 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 ;; - BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. - echo powerpc-be-beos - exit 0 ;; - BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. - echo powerpc-apple-beos - exit 0 ;; - BePC:BeOS:*:*) # BeOS running on Intel PC compatible. - echo i586-pc-beos - exit 0 ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit 0 ;; - SX-5:SUPER-UX:*:*) - echo sx5-nec-superux${UNAME_RELEASE} - exit 0 ;; - SX-6:SUPER-UX:*:*) - echo sx6-nec-superux${UNAME_RELEASE} - exit 0 ;; - Power*:Rhapsody:*:*) - echo powerpc-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Rhapsody:*:*) - echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE} - exit 0 ;; - *:Darwin:*:*) - UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - case $UNAME_PROCESSOR in - *86) UNAME_PROCESSOR=i686 ;; - unknown) UNAME_PROCESSOR=powerpc ;; - esac - echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} - exit 0 ;; - *:procnto*:*:* | *:QNX:[0123456789]*:*) - UNAME_PROCESSOR=`uname -p` - if test "$UNAME_PROCESSOR" = "x86"; then - UNAME_PROCESSOR=i386 - UNAME_MACHINE=pc - fi - echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE} - exit 0 ;; - *:QNX:*:4*) - echo i386-pc-qnx - exit 0 ;; - NSR-?:NONSTOP_KERNEL:*:*) - echo nsr-tandem-nsk${UNAME_RELEASE} - exit 0 ;; - *:NonStop-UX:*:*) - echo mips-compaq-nonstopux - exit 0 ;; - BS2000:POSIX*:*:*) - echo bs2000-siemens-sysv - exit 0 ;; - DS/*:UNIX_System_V:*:*) - echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE} - exit 0 ;; - *:Plan9:*:*) - # "uname -m" is not consistent, so use $cputype instead. 386 - # is converted to i386 for consistency with other x86 - # operating systems. - if test "$cputype" = "386"; then - UNAME_MACHINE=i386 - else - UNAME_MACHINE="$cputype" - fi - echo ${UNAME_MACHINE}-unknown-plan9 - exit 0 ;; - *:TOPS-10:*:*) - echo pdp10-unknown-tops10 - exit 0 ;; - *:TENEX:*:*) - echo pdp10-unknown-tenex - exit 0 ;; - KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) - echo pdp10-dec-tops20 - exit 0 ;; - XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) - echo pdp10-xkl-tops20 - exit 0 ;; - *:TOPS-20:*:*) - echo pdp10-unknown-tops20 - exit 0 ;; - *:ITS:*:*) - echo pdp10-unknown-its - exit 0 ;; - SEI:*:*:SEIUX) - echo mips-sei-seiux${UNAME_RELEASE} - exit 0 ;; - *:DragonFly:*:*) - echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` - exit 0 ;; - *:*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 ;; - esac -esac - -#echo '(No uname command or uname output not recognized.)' 1>&2 -#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 - -eval $set_cc_for_build -cat >$dummy.c < -# include -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0 - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit 0 ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit 0 ;; - c34*) - echo c34-convex-bsd - exit 0 ;; - c38*) - echo c38-convex-bsd - exit 0 ;; - c4*) - echo c4-convex-bsd - exit 0 ;; - esac -fi - -cat >&2 < in order to provide the needed -information to handle your system. - -config.guess timestamp = $timestamp - -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null` - -hostinfo = `(hostinfo) 2>/dev/null` -/bin/universe = `(/bin/universe) 2>/dev/null` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` -/bin/arch = `(/bin/arch) 2>/dev/null` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` - -UNAME_MACHINE = ${UNAME_MACHINE} -UNAME_RELEASE = ${UNAME_RELEASE} -UNAME_SYSTEM = ${UNAME_SYSTEM} -UNAME_VERSION = ${UNAME_VERSION} -EOF - -exit 1 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -Naur WindowMaker-0.91.0/config.sub wm/config.sub --- WindowMaker-0.91.0/config.sub 2004-10-26 08:10:35 +0400 +++ wm/config.sub 1970-01-01 03:00:00 +0300 @@ -1,1552 +0,0 @@ -#! /bin/sh -# Configuration validation subroutine script. -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. - -timestamp='2004-06-24' - -# This file is (in principle) common to ALL GNU software. -# The presence of a machine in this file suggests that SOME GNU software -# can handle that machine. It does not imply ALL GNU software can. -# -# 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 -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, 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 . Submit a context -# diff and a properly formatted ChangeLog entry. -# -# Configuration subroutine to validate and canonicalize a configuration type. -# Supply the specified configuration type as an argument. -# If it is invalid, we print an error message on stderr and exit with code 1. -# Otherwise, we print the canonical config type on stdout and succeed. - -# This file is supposed to be the same for all GNU packages -# and recognize all the CPU types, system types and aliases -# that are meaningful with *any* GNU software. -# Each package is responsible for reporting which valid configurations -# it does not support. The user should be able to distinguish -# a failure to support a valid configuration from a meaningless -# configuration. - -# The goal of this file is to map all the various variations of a given -# machine specification into a single specification in the form: -# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM -# or in some cases, the newer four-part form: -# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM -# It is wrong to echo any other type of specification. - -me=`echo "$0" | sed -e 's,.*/,,'` - -usage="\ -Usage: $0 [OPTION] CPU-MFR-OPSYS - $0 [OPTION] ALIAS - -Canonicalize a configuration name. - -Operation modes: - -h, --help print this help, then exit - -t, --time-stamp print date of last modification, then exit - -v, --version print version number, then exit - -Report bugs and patches to ." - -version="\ -GNU config.sub ($timestamp) - -Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 -Free Software Foundation, Inc. - -This is free software; see the source for copying conditions. There is NO -warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - -help=" -Try \`$me --help' for more information." - -# Parse command line -while test $# -gt 0 ; do - case $1 in - --time-stamp | --time* | -t ) - echo "$timestamp" ; exit 0 ;; - --version | -v ) - echo "$version" ; exit 0 ;; - --help | --h* | -h ) - echo "$usage"; exit 0 ;; - -- ) # Stop option processing - shift; break ;; - - ) # Use stdin as input. - break ;; - -* ) - echo "$me: invalid option $1$help" - exit 1 ;; - - *local*) - # First pass through any local machine types. - echo $1 - exit 0;; - - * ) - break ;; - esac -done - -case $# in - 0) echo "$me: missing argument$help" >&2 - exit 1;; - 1) ;; - *) echo "$me: too many arguments$help" >&2 - exit 1;; -esac - -# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). -# Here we must recognize all the valid KERNEL-OS combinations. -maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` -case $maybe_os in - nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ - kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] - then os=`echo $1 | sed 's/.*-/-/'` - else os=; fi - ;; -esac - -### Let's recognize common machines as not being operating systems so -### that things like config.sub decstation-3100 work. We also -### recognize some manufacturers as not being operating systems, so we -### can provide default operating systems below. -case $os in - -sun*os*) - # Prevent following clause from handling this invalid input. - ;; - -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ - -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ - -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ - -apple | -axis | -knuth | -cray) - os= - basic_machine=$1 - ;; - -sim | -cisco | -oki | -wec | -winbond) - os= - basic_machine=$1 - ;; - -scout) - ;; - -wrs) - os=-vxworks - basic_machine=$1 - ;; - -chorusos*) - os=-chorusos - basic_machine=$1 - ;; - -chorusrdb) - os=-chorusrdb - basic_machine=$1 - ;; - -hiux*) - os=-hiuxwe2 - ;; - -sco5) - os=-sco3.2v5 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco4) - os=-sco3.2v4 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco3.2v[4-9]*) - # Don't forget version if it is 3.2v4 or newer. - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -sco*) - os=-sco3.2v2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -udk*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -isc) - os=-isc2.2 - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -clix*) - basic_machine=clipper-intergraph - ;; - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; - -lynx*) - os=-lynxos - ;; - -ptx*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'` - ;; - -windowsnt*) - os=`echo $os | sed -e 's/windowsnt/winnt/'` - ;; - -psos*) - os=-psos - ;; - -mint | -mint[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; -esac - -# Decode aliases for certain CPU-COMPANY combinations. -case $basic_machine in - # Recognize the basic CPU types without company name. - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ - | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ - | c4x | clipper \ - | d10v | d30v | dlx | dsp16xx \ - | fr30 | frv \ - | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ - | i370 | i860 | i960 | ia64 \ - | ip2k | iq2000 \ - | m32r | m32rle | m68000 | m68k | m88k | mcore \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ - | mips64vr | mips64vrel \ - | mips64orion | mips64orionel \ - | mips64vr4100 | mips64vr4100el \ - | mips64vr4300 | mips64vr4300el \ - | mips64vr5000 | mips64vr5000el \ - | mipsisa32 | mipsisa32el \ - | mipsisa32r2 | mipsisa32r2el \ - | mipsisa64 | mipsisa64el \ - | mipsisa64r2 | mipsisa64r2el \ - | mipsisa64sb1 | mipsisa64sb1el \ - | mipsisa64sr71k | mipsisa64sr71kel \ - | mipstx39 | mipstx39el \ - | mn10200 | mn10300 \ - | msp430 \ - | ns16k | ns32k \ - | openrisc | 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 \ - | sh64 | sh64le \ - | sparc | sparc64 | sparc86x | sparclet | sparclite | sparcv8 | sparcv9 | sparcv9b \ - | strongarm \ - | tahoe | thumb | tic4x | tic80 | tron \ - | v850 | v850e \ - | we32k \ - | x86 | xscale | xstormy16 | xtensa \ - | z8k) - basic_machine=$basic_machine-unknown - ;; - m6811 | m68hc11 | m6812 | m68hc12) - # Motorola 68HC11/12. - basic_machine=$basic_machine-unknown - os=-none - ;; - m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) - ;; - - # We use `pc' rather than `unknown' - # because (1) that's what they normally are, and - # (2) the word "unknown" tends to confuse beginning users. - i*86 | x86_64) - basic_machine=$basic_machine-pc - ;; - # Object if more than one company name word. - *-*-*) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ - | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ - | avr-* \ - | bs2000-* \ - | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ - | clipper-* | craynv-* | cydra-* \ - | d10v-* | d30v-* | dlx-* \ - | elxsi-* \ - | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \ - | h8300-* | h8500-* \ - | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ - | i*86-* | i860-* | i960-* | ia64-* \ - | ip2k-* | iq2000-* \ - | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ - | m88110-* | m88k-* | mcore-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ - | mips64vr-* | mips64vrel-* \ - | mips64orion-* | mips64orionel-* \ - | mips64vr4100-* | mips64vr4100el-* \ - | mips64vr4300-* | mips64vr4300el-* \ - | mips64vr5000-* | mips64vr5000el-* \ - | mipsisa32-* | mipsisa32el-* \ - | mipsisa32r2-* | mipsisa32r2el-* \ - | mipsisa64-* | mipsisa64el-* \ - | mipsisa64r2-* | mipsisa64r2el-* \ - | mipsisa64sb1-* | mipsisa64sb1el-* \ - | mipsisa64sr71k-* | mipsisa64sr71kel-* \ - | mipstx39-* | mipstx39el-* \ - | mmix-* \ - | msp430-* \ - | none-* | np1-* | ns16k-* | ns32k-* \ - | orion-* \ - | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ - | pyramid-* \ - | romp-* | rs6000-* \ - | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \ - | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ - | sparc-* | sparc64-* | sparc86x-* | sparclet-* | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ - | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ - | tron-* \ - | v850-* | v850e-* | vax-* \ - | we32k-* \ - | x86-* | x86_64-* | xps100-* | xscale-* | xstormy16-* \ - | xtensa-* \ - | ymp-* \ - | z8k-*) - ;; - # Recognize the various machine names and aliases which stand - # for a CPU type and a company and sometimes even an OS. - 386bsd) - basic_machine=i386-unknown - os=-bsd - ;; - 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - basic_machine=m68000-att - ;; - 3b*) - basic_machine=we32k-att - ;; - a29khif) - basic_machine=a29k-amd - os=-udi - ;; - abacus) - basic_machine=abacus-unknown - ;; - adobe68k) - basic_machine=m68010-adobe - os=-scout - ;; - alliant | fx80) - basic_machine=fx80-alliant - ;; - altos | altos3068) - basic_machine=m68k-altos - ;; - am29k) - basic_machine=a29k-none - os=-bsd - ;; - amd64) - basic_machine=x86_64-pc - ;; - amd64-*) - basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - amdahl) - basic_machine=580-amdahl - os=-sysv - ;; - amiga | amiga-*) - basic_machine=m68k-unknown - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=-amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=-sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=-sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=-bsd - ;; - aux) - basic_machine=m68k-apple - os=-aux - ;; - balance) - basic_machine=ns32k-sequent - os=-dynix - ;; - c90) - basic_machine=c90-cray - os=-unicos - ;; - convex-c1) - basic_machine=c1-convex - os=-bsd - ;; - convex-c2) - basic_machine=c2-convex - os=-bsd - ;; - convex-c32) - basic_machine=c32-convex - os=-bsd - ;; - convex-c34) - basic_machine=c34-convex - os=-bsd - ;; - convex-c38) - basic_machine=c38-convex - os=-bsd - ;; - cray | j90) - basic_machine=j90-cray - os=-unicos - ;; - craynv) - basic_machine=craynv-cray - os=-unicosmp - ;; - cr16c) - basic_machine=cr16c-unknown - os=-elf - ;; - crds | unos) - basic_machine=m68k-crds - ;; - cris | cris-* | etrax*) - basic_machine=cris-axis - ;; - crx) - basic_machine=crx-unknown - os=-elf - ;; - da30 | da30-*) - basic_machine=m68k-da30 - ;; - decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) - basic_machine=mips-dec - ;; - decsystem10* | dec10*) - basic_machine=pdp10-dec - os=-tops10 - ;; - decsystem20* | dec20*) - basic_machine=pdp10-dec - os=-tops20 - ;; - delta | 3300 | motorola-3300 | motorola-delta \ - | 3300-motorola | delta-motorola) - basic_machine=m68k-motorola - ;; - delta88) - basic_machine=m88k-motorola - os=-sysv3 - ;; - dpx20 | dpx20-*) - basic_machine=rs6000-bull - os=-bosx - ;; - dpx2* | dpx2*-bull) - basic_machine=m68k-bull - os=-sysv3 - ;; - ebmon29k) - basic_machine=a29k-amd - os=-ebmon - ;; - elxsi) - basic_machine=elxsi-elxsi - os=-bsd - ;; - encore | umax | mmax) - basic_machine=ns32k-encore - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=-ose - ;; - fx2800) - basic_machine=i860-alliant - ;; - genix) - basic_machine=ns32k-ns - ;; - gmicro) - basic_machine=tron-gmicro - os=-sysv - ;; - go32) - basic_machine=i386-pc - os=-go32 - ;; - h3050r* | hiux*) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=-hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=-xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=-hms - ;; - harris) - basic_machine=m88k-harris - os=-sysv3 - ;; - hp300-*) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=-bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=-hpux - ;; - hp3k9[0-9][0-9] | hp9[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k2[0-9][0-9] | hp9k31[0-9]) - basic_machine=m68000-hp - ;; - hp9k3[2-9][0-9]) - basic_machine=m68k-hp - ;; - hp9k6[0-9][0-9] | hp6[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hp9k7[0-79][0-9] | hp7[0-79][0-9]) - basic_machine=hppa1.1-hp - ;; - hp9k78[0-9] | hp78[0-9]) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) - # FIXME: really hppa2.0-hp - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][13679] | hp8[0-9][13679]) - basic_machine=hppa1.1-hp - ;; - hp9k8[0-9][0-9] | hp8[0-9][0-9]) - basic_machine=hppa1.0-hp - ;; - hppa-next) - os=-nextstep3 - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=-osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=-proelf - ;; - i370-ibm* | ibm*) - basic_machine=i370-ibm - ;; -# I'm not sure what "Sysv32" means. Should this be sysv3.2? - i*86v32) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv32 - ;; - i*86v4*) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv4 - ;; - i*86v) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-sysv - ;; - i*86sol2) - basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'` - os=-solaris2 - ;; - i386mach) - basic_machine=i386-mach - os=-mach - ;; - i386-vsta | vsta) - basic_machine=i386-unknown - os=-vsta - ;; - iris | iris4d) - basic_machine=mips-sgi - case $os in - -irix*) - ;; - *) - os=-irix4 - ;; - esac - ;; - isi68 | isi) - basic_machine=m68k-isi - os=-sysv - ;; - m88k-omron*) - basic_machine=m88k-omron - ;; - magnum | m3230) - basic_machine=mips-mips - os=-sysv - ;; - merlin) - basic_machine=ns32k-utek - os=-sysv - ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 - ;; - miniframe) - basic_machine=m68000-convergent - ;; - *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) - basic_machine=m68k-atari - os=-mint - ;; - mips3*-*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'` - ;; - mips3*) - basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown - ;; - monitor) - basic_machine=m68k-rom68k - os=-coff - ;; - morphos) - basic_machine=powerpc-unknown - os=-morphos - ;; - msdos) - basic_machine=i386-pc - os=-msdos - ;; - mvs) - basic_machine=i370-ibm - os=-mvs - ;; - ncr3000) - basic_machine=i486-ncr - os=-sysv4 - ;; - netbsd386) - basic_machine=i386-unknown - os=-netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=-linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=-newsos - ;; - news1000) - basic_machine=m68030-sony - os=-newsos - ;; - news-3600 | risc-news) - basic_machine=mips-sony - os=-newsos - ;; - necv70) - basic_machine=v70-nec - os=-sysv - ;; - next | m*-next ) - basic_machine=m68k-next - case $os in - -nextstep* ) - ;; - -ns2*) - os=-nextstep2 - ;; - *) - os=-nextstep3 - ;; - esac - ;; - nh3000) - basic_machine=m68k-harris - os=-cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=-cxux - ;; - nindy960) - basic_machine=i960-intel - os=-nindy - ;; - mon960) - basic_machine=i960-intel - os=-mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=-nonstopux - ;; - np1) - basic_machine=np1-gould - ;; - nsr-tandem) - basic_machine=nsr-tandem - ;; - op50n-* | op60c-*) - basic_machine=hppa1.1-oki - os=-proelf - ;; - or32 | or32-*) - basic_machine=or32-unknown - os=-coff - ;; - os400) - basic_machine=powerpc-ibm - os=-os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=-ose - ;; - os68k) - basic_machine=m68k-none - os=-os68k - ;; - pa-hitachi) - basic_machine=hppa1.1-hitachi - os=-hiuxwe2 - ;; - paragon) - basic_machine=i860-intel - os=-osf - ;; - pbd) - basic_machine=sparc-tti - ;; - pbb) - basic_machine=m68k-tti - ;; - pc532 | pc532-*) - basic_machine=ns32k-pc532 - ;; - pentium | p5 | k5 | k6 | nexgen | viac3) - basic_machine=i586-pc - ;; - pentiumpro | p6 | 6x86 | athlon | athlon_*) - basic_machine=i686-pc - ;; - pentiumii | pentium2 | pentiumiii | pentium3) - basic_machine=i686-pc - ;; - pentium4) - basic_machine=i786-pc - ;; - pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) - basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumpro-* | p6-* | 6x86-* | athlon-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) - basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pentium4-*) - basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - pn) - basic_machine=pn-gould - ;; - power) basic_machine=power-ibm - ;; - ppc) basic_machine=powerpc-unknown - ;; - ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppcle | powerpclittle | ppc-le | powerpc-little) - basic_machine=powerpcle-unknown - ;; - ppcle-* | powerpclittle-*) - basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64) basic_machine=powerpc64-unknown - ;; - ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ppc64le | powerpc64little | ppc64-le | powerpc64-little) - basic_machine=powerpc64le-unknown - ;; - ppc64le-* | powerpc64little-*) - basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'` - ;; - ps2) - basic_machine=i386-ibm - ;; - pw32) - basic_machine=i586-unknown - os=-pw32 - ;; - rom68k) - basic_machine=m68k-rom68k - os=-coff - ;; - rm[46]00) - basic_machine=mips-siemens - ;; - rtpc | rtpc-*) - basic_machine=romp-ibm - ;; - s390 | s390-*) - basic_machine=s390-ibm - ;; - s390x | s390x-*) - basic_machine=s390x-ibm - ;; - sa29200) - basic_machine=a29k-amd - os=-udi - ;; - sb1) - basic_machine=mipsisa64sb1-unknown - ;; - sb1el) - basic_machine=mipsisa64sb1el-unknown - ;; - sei) - basic_machine=mips-sei - os=-seiux - ;; - sequent) - basic_machine=i386-sequent - ;; - sh) - basic_machine=sh-hitachi - os=-hms - ;; - sh64) - basic_machine=sh64-unknown - ;; - sparclite-wrs | simso-wrs) - basic_machine=sparclite-wrs - os=-vxworks - ;; - sps7) - basic_machine=m68k-bull - os=-sysv2 - ;; - spur) - basic_machine=spur-unknown - ;; - st2000) - basic_machine=m68k-tandem - ;; - stratus) - basic_machine=i860-stratus - os=-sysv4 - ;; - sun2) - basic_machine=m68000-sun - ;; - sun2os3) - basic_machine=m68000-sun - os=-sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=-sunos4 - ;; - sun3os3) - basic_machine=m68k-sun - os=-sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=-sunos4 - ;; - sun4os3) - basic_machine=sparc-sun - os=-sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=-sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=-solaris2 - ;; - sun3 | sun3-*) - basic_machine=m68k-sun - ;; - sun4) - basic_machine=sparc-sun - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - ;; - sv1) - basic_machine=sv1-cray - os=-unicos - ;; - symmetry) - basic_machine=i386-sequent - os=-dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=-unicos - ;; - t90) - basic_machine=t90-cray - os=-unicos - ;; - tic54x | c54x*) - basic_machine=tic54x-unknown - os=-coff - ;; - tic55x | c55x*) - basic_machine=tic55x-unknown - os=-coff - ;; - tic6x | c6x*) - basic_machine=tic6x-unknown - os=-coff - ;; - tx39) - basic_machine=mipstx39-unknown - ;; - tx39el) - basic_machine=mipstx39el-unknown - ;; - toad1) - basic_machine=pdp10-xkl - os=-tops20 - ;; - tower | tower-32) - basic_machine=m68k-ncr - ;; - tpf) - basic_machine=s390x-ibm - os=-tpf - ;; - udi29k) - basic_machine=a29k-amd - os=-udi - ;; - ultra3) - basic_machine=a29k-nyu - os=-sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=-none - ;; - vaxv) - basic_machine=vax-dec - os=-sysv - ;; - vms) - basic_machine=vax-dec - os=-vms - ;; - vpp*|vx|vx-*) - basic_machine=f301-fujitsu - ;; - vxworks960) - basic_machine=i960-wrs - os=-vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=-vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=-vxworks - ;; - w65*) - basic_machine=w65-wdc - os=-none - ;; - w89k-*) - basic_machine=hppa1.1-winbond - os=-proelf - ;; - xps | xps100) - basic_machine=xps100-honeywell - ;; - ymp) - basic_machine=ymp-cray - os=-unicos - ;; - z8k-*-coff) - basic_machine=z8k-unknown - os=-sim - ;; - none) - basic_machine=none-none - os=-none - ;; - -# Here we handle the default manufacturer of certain CPU types. It is in -# some cases the only manufacturer, in others, it is the most popular. - w89k) - basic_machine=hppa1.1-winbond - ;; - op50n) - basic_machine=hppa1.1-oki - ;; - op60c) - basic_machine=hppa1.1-oki - ;; - romp) - basic_machine=romp-ibm - ;; - mmix) - basic_machine=mmix-knuth - ;; - rs6000) - basic_machine=rs6000-ibm - ;; - vax) - basic_machine=vax-dec - ;; - pdp10) - # there are many clones, so DEC is not a safe bet - basic_machine=pdp10-unknown - ;; - pdp11) - basic_machine=pdp11-dec - ;; - we32k) - basic_machine=we32k-att - ;; - sh3 | sh4 | 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 - ;; - cydra) - basic_machine=cydra-cydrome - ;; - orion) - basic_machine=orion-highlevel - ;; - orion105) - basic_machine=clipper-highlevel - ;; - mac | mpw | mac-mpw) - basic_machine=m68k-apple - ;; - pmac | pmac-mpw) - basic_machine=powerpc-apple - ;; - *-unknown) - # Make sure to match an already-canonicalized machine name. - ;; - *) - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2 - exit 1 - ;; -esac - -# Here we canonicalize certain aliases for manufacturers. -case $basic_machine in - *-digital*) - basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'` - ;; - *-commodore*) - basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'` - ;; - *) - ;; -esac - -# Decode manufacturer-specific aliases for certain operating systems. - -if [ x"$os" != x"" ] -then -case $os in - # First match some system type aliases - # that might get confused with valid system types. - # -solaris* is a basic system type, with this one exception. - -solaris1 | -solaris1.*) - os=`echo $os | sed -e 's|solaris1|sunos4|'` - ;; - -solaris) - os=-solaris2 - ;; - -svr4*) - os=-sysv4 - ;; - -unixware*) - os=-sysv4.2uw - ;; - -gnu/linux*) - os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` - ;; - # First accept the basic system types. - # The portable systems comes first. - # Each alternative MUST END IN A *, to match a version number. - # -sysv* is not here because it comes later, after sysvr4. - -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ - | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\ - | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \ - | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ - | -aos* \ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* \ - | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ - | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ - | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ - | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ - | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ - | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*) - # Remember, each alternative MUST END IN *, to match a version number. - ;; - -qnx*) - case $basic_machine in - x86-* | i*86-*) - ;; - *) - os=-nto$os - ;; - esac - ;; - -nto-qnx*) - ;; - -nto*) - os=`echo $os | sed -e 's|nto|nto-qnx|'` - ;; - -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \ - | -windows* | -osx | -abug | -netware* | -os9* | -beos* \ - | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) - ;; - -mac*) - os=`echo $os | sed -e 's|mac|macos|'` - ;; - -linux-dietlibc) - os=-linux-dietlibc - ;; - -linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - -sunos5*) - os=`echo $os | sed -e 's|sunos5|solaris2|'` - ;; - -sunos6*) - os=`echo $os | sed -e 's|sunos6|solaris3|'` - ;; - -opened*) - os=-openedition - ;; - -os400*) - os=-os400 - ;; - -wince*) - os=-wince - ;; - -osfrose*) - os=-osfrose - ;; - -osf*) - os=-osf - ;; - -utek*) - os=-bsd - ;; - -dynix*) - os=-bsd - ;; - -acis*) - os=-aos - ;; - -atheos*) - os=-atheos - ;; - -syllable*) - os=-syllable - ;; - -386bsd) - os=-bsd - ;; - -ctix* | -uts*) - os=-sysv - ;; - -nova*) - os=-rtmk-nova - ;; - -ns2 ) - os=-nextstep2 - ;; - -nsk*) - os=-nsk - ;; - # Preserve the version number of sinix5. - -sinix5.*) - os=`echo $os | sed -e 's|sinix|sysv|'` - ;; - -sinix*) - os=-sysv4 - ;; - -tpf*) - os=-tpf - ;; - -triton*) - os=-sysv3 - ;; - -oss*) - os=-sysv3 - ;; - -svr4) - os=-sysv4 - ;; - -svr3) - os=-sysv3 - ;; - -sysvr4) - os=-sysv4 - ;; - # This must come after -sysvr4. - -sysv*) - ;; - -ose*) - os=-ose - ;; - -es1800*) - os=-ose - ;; - -xenix) - os=-xenix - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - os=-mint - ;; - -aros*) - os=-aros - ;; - -kaos*) - os=-kaos - ;; - -none) - ;; - *) - # Get rid of the `-' at the beginning of $os. - os=`echo $os | sed 's/[^-]*-//'` - echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2 - exit 1 - ;; -esac -else - -# Here we handle the default operating systems that come with various machines. -# The value should be what the vendor currently ships out the door with their -# machine or put another way, the most popular os provided with the machine. - -# Note that if you're going to try to match "-MANUFACTURER" here (say, -# "-sun"), then you have to tell the case statement up towards the top -# that MANUFACTURER isn't an operating system. Otherwise, code above -# will signal an error saying that MANUFACTURER isn't an operating -# system, and we'll never get to this point. - -case $basic_machine in - *-acorn) - os=-riscix1.2 - ;; - arm*-rebel) - os=-linux - ;; - arm*-semi) - os=-aout - ;; - c4x-* | tic4x-*) - os=-coff - ;; - # This must come before the *-dec entry. - pdp10-*) - os=-tops20 - ;; - pdp11-*) - os=-none - ;; - *-dec | vax-*) - os=-ultrix4.2 - ;; - m68*-apollo) - os=-domain - ;; - i386-sun) - os=-sunos4.0.2 - ;; - m68000-sun) - os=-sunos3 - # This also exists in the configure program, but was not the - # default. - # os=-sunos4 - ;; - m68*-cisco) - os=-aout - ;; - mips*-cisco) - os=-elf - ;; - mips*-*) - os=-elf - ;; - or32-*) - os=-coff - ;; - *-tti) # must be before sparc entry or we get the wrong os. - os=-sysv3 - ;; - sparc-* | *-sun) - os=-sunos4.1.1 - ;; - *-be) - os=-beos - ;; - *-ibm) - os=-aix - ;; - *-knuth) - os=-mmixware - ;; - *-wec) - os=-proelf - ;; - *-winbond) - os=-proelf - ;; - *-oki) - os=-proelf - ;; - *-hp) - os=-hpux - ;; - *-hitachi) - os=-hiux - ;; - i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=-sysv - ;; - *-cbm) - os=-amigaos - ;; - *-dg) - os=-dgux - ;; - *-dolphin) - os=-sysv3 - ;; - m68k-ccur) - os=-rtu - ;; - m88k-omron*) - os=-luna - ;; - *-next ) - os=-nextstep - ;; - *-sequent) - os=-ptx - ;; - *-crds) - os=-unos - ;; - *-ns) - os=-genix - ;; - i370-*) - os=-mvs - ;; - *-next) - os=-nextstep3 - ;; - *-gould) - os=-sysv - ;; - *-highlevel) - os=-bsd - ;; - *-encore) - os=-bsd - ;; - *-sgi) - os=-irix - ;; - *-siemens) - os=-sysv4 - ;; - *-masscomp) - os=-rtu - ;; - f30[01]-fujitsu | f700-fujitsu) - os=-uxpv - ;; - *-rom68k) - os=-coff - ;; - *-*bug) - os=-coff - ;; - *-apple) - os=-macos - ;; - *-atari*) - os=-mint - ;; - *) - os=-none - ;; -esac -fi - -# Here we handle the case where we know the os, and the CPU type, but not the -# manufacturer. We pick the logical manufacturer. -vendor=unknown -case $basic_machine in - *-unknown) - case $os in - -riscix*) - vendor=acorn - ;; - -sunos*) - vendor=sun - ;; - -aix*) - vendor=ibm - ;; - -beos*) - vendor=be - ;; - -hpux*) - vendor=hp - ;; - -mpeix*) - vendor=hp - ;; - -hiux*) - vendor=hitachi - ;; - -unos*) - vendor=crds - ;; - -dgux*) - vendor=dg - ;; - -luna*) - vendor=omron - ;; - -genix*) - vendor=ns - ;; - -mvs* | -opened*) - vendor=ibm - ;; - -os400*) - vendor=ibm - ;; - -ptx*) - vendor=sequent - ;; - -tpf*) - vendor=ibm - ;; - -vxsim* | -vxworks* | -windiss*) - vendor=wrs - ;; - -aux*) - vendor=apple - ;; - -hms*) - vendor=hitachi - ;; - -mpw* | -macos*) - vendor=apple - ;; - -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) - vendor=atari - ;; - -vos*) - vendor=stratus - ;; - esac - basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"` - ;; -esac - -echo $basic_machine$os -exit 0 - -# Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) -# time-stamp-start: "timestamp='" -# time-stamp-format: "%:y-%02m-%02d" -# time-stamp-end: "'" -# End: diff -Naur WindowMaker-0.91.0/configure wm/configure --- WindowMaker-0.91.0/configure 2004-10-26 08:10:49 +0400 +++ wm/configure 1970-01-01 03:00:00 +0300 @@ -1,27798 +0,0 @@ -#! /bin/sh -# Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59. -# -# Copyright (C) 2003 Free Software Foundation, Inc. -# This configure script is free software; the Free Software Foundation -# gives unlimited permission to copy, distribute and modify it. -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - - - -# Check that we are running under the correct shell. -SHELL=${CONFIG_SHELL-/bin/sh} - -case X$ECHO in -X*--fallback-echo) - # Remove one level of quotation (which was required for Make). - ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','` - ;; -esac - -echo=${ECHO-echo} -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then - # Yippee, $echo works! - : -else - # Restart under the correct shell. - exec $SHELL "$0" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat </dev/null && - echo_test_string="`eval $cmd`" && - (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null - then - break - fi - done -fi - -if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - : -else - # The Solaris, AIX, and Digital Unix default echo programs unquote - # backslashes. This makes it impossible to quote backslashes using - # echo "$something" | sed 's/\\/\\\\/g' - # - # So, first we look for a working echo in the user's PATH. - - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for dir in $PATH /usr/ucb; do - IFS="$lt_save_ifs" - if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && - test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$dir/echo" - break - fi - done - IFS="$lt_save_ifs" - - if test "X$echo" = Xecho; then - # We didn't find a better echo, so look for alternatives. - if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # This shell has a builtin print -r that does the trick. - echo='print -r' - elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) && - test "X$CONFIG_SHELL" != X/bin/ksh; then - # If we have ksh, try running configure again with it. - ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} - export ORIGINAL_CONFIG_SHELL - CONFIG_SHELL=/bin/ksh - export CONFIG_SHELL - exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"} - else - # Try using printf. - echo='printf %s\n' - if test "X`($echo '\t') 2>/dev/null`" = 'X\t' && - echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - # Cool, printf works - : - elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL - export CONFIG_SHELL - SHELL="$CONFIG_SHELL" - export SHELL - echo="$CONFIG_SHELL $0 --fallback-echo" - elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` && - test "X$echo_testing_string" = 'X\t' && - echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` && - test "X$echo_testing_string" = "X$echo_test_string"; then - echo="$CONFIG_SHELL $0 --fallback-echo" - else - # maybe with a smaller string... - prev=: - - for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do - if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null - then - break - fi - prev="$cmd" - done - - if test "$prev" != 'sed 50q "$0"'; then - echo_test_string=`eval $prev` - export echo_test_string - exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"} - else - # Oops. We lost completely, so just stick with echo. - echo=echo - fi - fi - fi - fi -fi -fi - -# Copy echo and quote the copy suitably for passing to libtool from -# the Makefile, instead of quoting the original, which is used later. -ECHO=$echo -if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then - ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo" -fi - - - - -tagnames=${tagnames+${tagnames},}CXX - -tagnames=${tagnames+${tagnames},}F77 - -# Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -# so uname gets run too. -ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - -exec 6>&1 - -# -# Initializations. -# -ac_default_prefix=/usr/local -ac_config_libobj_dir=. -cross_compiling=no -subdirs= -MFLAGS= -MAKEFLAGS= -SHELL=${CONFIG_SHELL-/bin/sh} - -# Maximum number of lines to put in a shell here document. -# This variable seems obsolete. It should probably be removed, and -# only ac_max_sed_lines should be used. -: ${ac_max_here_lines=38} - -# Identity of this package. -PACKAGE_NAME= -PACKAGE_TARNAME= -PACKAGE_VERSION= -PACKAGE_STRING= -PACKAGE_BUGREPORT= - -ac_unique_file="src/WindowMaker.h" -# Factoring default headers for most tests. -ac_includes_default="\ -#include -#if HAVE_SYS_TYPES_H -# include -#endif -#if HAVE_SYS_STAT_H -# include -#endif -#if STDC_HEADERS -# include -# include -#else -# if HAVE_STDLIB_H -# include -# endif -#endif -#if HAVE_STRING_H -# if !STDC_HEADERS && HAVE_MEMORY_H -# include -# endif -# include -#endif -#if HAVE_STRINGS_H -# include -#endif -#if HAVE_INTTYPES_H -# include -#else -# if HAVE_STDINT_H -# include -# endif -#endif -#if HAVE_UNISTD_H -# include -#endif" - -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO SET_MAKE build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ALLOCA CPP_PATH NOSTRICTALIASING PKGCONFIG XGETTEXT DLLIBS INTLIBS NLSDIR MOFILES WPMOFILES WINGSMOFILES supported_locales LITE NETLIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS X_LIBRARY_PATH XFTCONFIG XFTFLAGS XFTLIBS XCFLAGS XLFLAGS XLIBS LIBRARY_SEARCH_PATH HEADER_SEARCH_PATH GFXLIBS ICONEXT wprefsdir LIBOBJS LTLIBOBJS' -ac_subst_files='' - -# Initialize some variables set by options. -ac_init_help= -ac_init_version=false -# The variables have the same names as the options, with -# dashes changed to underlines. -cache_file=/dev/null -exec_prefix=NONE -no_create= -no_recursion= -prefix=NONE -program_prefix=NONE -program_suffix=NONE -program_transform_name=s,x,x, -silent= -site= -srcdir= -verbose= -x_includes=NONE -x_libraries=NONE - -# Installation directory options. -# These are left unexpanded so users can "make install exec_prefix=/foo" -# and all the variables that are supposed to be based on exec_prefix -# by default will actually change. -# Use braces instead of parens because sh, perl, etc. also accept them. -bindir='${exec_prefix}/bin' -sbindir='${exec_prefix}/sbin' -libexecdir='${exec_prefix}/libexec' -datadir='${prefix}/share' -sysconfdir='${prefix}/etc' -sharedstatedir='${prefix}/com' -localstatedir='${prefix}/var' -libdir='${exec_prefix}/lib' -includedir='${prefix}/include' -oldincludedir='/usr/include' -infodir='${prefix}/info' -mandir='${prefix}/man' - -ac_prev= -for ac_option -do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then - eval "$ac_prev=\$ac_option" - ac_prev= - continue - fi - - ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` - - # Accept the important Cygnus configure options, so we can diagnose typos. - - case $ac_option in - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; - -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) - bindir=$ac_optarg ;; - - -build | --build | --buil | --bui | --bu) - ac_prev=build_alias ;; - -build=* | --build=* | --buil=* | --bui=* | --bu=*) - build_alias=$ac_optarg ;; - - -cache-file | --cache-file | --cache-fil | --cache-fi \ - | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) - ac_prev=cache_file ;; - -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ - | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) - cache_file=$ac_optarg ;; - - --config-cache | -C) - cache_file=config.cache ;; - - -datadir | --datadir | --datadi | --datad | --data | --dat | --da) - ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ - | --da=*) - datadir=$ac_optarg ;; - - -disable-* | --disable-*) - ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - eval "enable_$ac_feature=no" ;; - - -enable-* | --enable-*) - ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid feature name: $ac_feature" >&2 - { (exit 1); exit 1; }; } - ac_feature=`echo $ac_feature | sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "enable_$ac_feature='$ac_optarg'" ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ - | --exec | --exe | --ex) - ac_prev=exec_prefix ;; - -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ - | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ - | --exec=* | --exe=* | --ex=*) - exec_prefix=$ac_optarg ;; - - -gas | --gas | --ga | --g) - # Obsolete; use --with-gas. - with_gas=yes ;; - - -help | --help | --hel | --he | -h) - ac_init_help=long ;; - -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) - ac_init_help=recursive ;; - -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) - ac_init_help=short ;; - - -host | --host | --hos | --ho) - ac_prev=host_alias ;; - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; - -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ - | --includ=* | --inclu=* | --incl=* | --inc=*) - includedir=$ac_optarg ;; - - -infodir | --infodir | --infodi | --infod | --info | --inf) - ac_prev=infodir ;; - -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) - infodir=$ac_optarg ;; - - -libdir | --libdir | --libdi | --libd) - ac_prev=libdir ;; - -libdir=* | --libdir=* | --libdi=* | --libd=*) - libdir=$ac_optarg ;; - - -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ - | --libexe | --libex | --libe) - ac_prev=libexecdir ;; - -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst \ - | --locals | --local | --loca | --loc | --lo) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* \ - | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) - ac_prev=mandir ;; - -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) - mandir=$ac_optarg ;; - - -nfp | --nfp | --nf) - # Obsolete; use --without-fp. - with_fp=no ;; - - -no-create | --no-create | --no-creat | --no-crea | --no-cre \ - | --no-cr | --no-c | -n) - no_create=yes ;; - - -no-recursion | --no-recursion | --no-recursio | --no-recursi \ - | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) - no_recursion=yes ;; - - -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ - | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ - | --oldin | --oldi | --old | --ol | --o) - ac_prev=oldincludedir ;; - -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ - | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ - | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) - oldincludedir=$ac_optarg ;; - - -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) - ac_prev=prefix ;; - -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) - prefix=$ac_optarg ;; - - -program-prefix | --program-prefix | --program-prefi | --program-pref \ - | --program-pre | --program-pr | --program-p) - ac_prev=program_prefix ;; - -program-prefix=* | --program-prefix=* | --program-prefi=* \ - | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) - program_prefix=$ac_optarg ;; - - -program-suffix | --program-suffix | --program-suffi | --program-suff \ - | --program-suf | --program-su | --program-s) - ac_prev=program_suffix ;; - -program-suffix=* | --program-suffix=* | --program-suffi=* \ - | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) - program_suffix=$ac_optarg ;; - - -program-transform-name | --program-transform-name \ - | --program-transform-nam | --program-transform-na \ - | --program-transform-n | --program-transform- \ - | --program-transform | --program-transfor \ - | --program-transfo | --program-transf \ - | --program-trans | --program-tran \ - | --progr-tra | --program-tr | --program-t) - ac_prev=program_transform_name ;; - -program-transform-name=* | --program-transform-name=* \ - | --program-transform-nam=* | --program-transform-na=* \ - | --program-transform-n=* | --program-transform-=* \ - | --program-transform=* | --program-transfor=* \ - | --program-transfo=* | --program-transf=* \ - | --program-trans=* | --program-tran=* \ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; - - -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) - ac_prev=sbindir ;; - -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ - | --sbi=* | --sb=*) - sbindir=$ac_optarg ;; - - -sharedstatedir | --sharedstatedir | --sharedstatedi \ - | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ - | --sharedst | --shareds | --shared | --share | --shar \ - | --sha | --sh) - ac_prev=sharedstatedir ;; - -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ - | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ - | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ - | --sha=* | --sh=*) - sharedstatedir=$ac_optarg ;; - - -site | --site | --sit) - ac_prev=site ;; - -site=* | --site=* | --sit=*) - site=$ac_optarg ;; - - -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) - ac_prev=srcdir ;; - -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) - srcdir=$ac_optarg ;; - - -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ - | --syscon | --sysco | --sysc | --sys | --sy) - ac_prev=sysconfdir ;; - -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ - | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) - sysconfdir=$ac_optarg ;; - - -target | --target | --targe | --targ | --tar | --ta | --t) - ac_prev=target_alias ;; - -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) - target_alias=$ac_optarg ;; - - -v | -verbose | --verbose | --verbos | --verbo | --verb) - verbose=yes ;; - - -version | --version | --versio | --versi | --vers | -V) - ac_init_version=: ;; - - -with-* | --with-*) - ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package| sed 's/-/_/g'` - case $ac_option in - *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; - *) ac_optarg=yes ;; - esac - eval "with_$ac_package='$ac_optarg'" ;; - - -without-* | --without-*) - ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. - expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid package name: $ac_package" >&2 - { (exit 1); exit 1; }; } - ac_package=`echo $ac_package | sed 's/-/_/g'` - eval "with_$ac_package=no" ;; - - --x) - # Obsolete; use --with-x. - with_x=yes ;; - - -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ - | --x-incl | --x-inc | --x-in | --x-i) - ac_prev=x_includes ;; - -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ - | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) - x_includes=$ac_optarg ;; - - -x-libraries | --x-libraries | --x-librarie | --x-librari \ - | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) - ac_prev=x_libraries ;; - -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - - -*) { echo "$as_me: error: unrecognized option: $ac_option -Try \`$0 --help' for more information." >&2 - { (exit 1); exit 1; }; } - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. - expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && - { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 - { (exit 1); exit 1; }; } - ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` - eval "$ac_envvar='$ac_optarg'" - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. - echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - - esac -done - -if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` - { echo "$as_me: error: missing argument to $ac_option" >&2 - { (exit 1); exit 1; }; } -fi - -# Be sure to have absolute paths. -for ac_var in exec_prefix prefix -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* | NONE | '' ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# Be sure to have absolute paths. -for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ - localstatedir libdir includedir oldincludedir infodir mandir -do - eval ac_val=$`echo $ac_var` - case $ac_val in - [\\/$]* | ?:[\\/]* ) ;; - *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 - { (exit 1); exit 1; }; };; - esac -done - -# There might be people who depend on the old broken behavior: `$host' -# used to hold the argument of --host etc. -# FIXME: To remove some day. -build=$build_alias -host=$host_alias -target=$target_alias - -# FIXME: To remove some day. -if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe - echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes - fi -fi - -ac_tool_prefix= -test -n "$host_alias" && ac_tool_prefix=$host_alias- - -test "$silent" = yes && exec 6>/dev/null - - -# Find the source files, if location was not specified. -if test -z "$srcdir"; then - ac_srcdir_defaulted=yes - # Try the directory containing this script, then its parent. - ac_confdir=`(dirname "$0") 2>/dev/null || -$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$0" : 'X\(//\)[^/]' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$0" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - srcdir=$ac_confdir - if test ! -r $srcdir/$ac_unique_file; then - srcdir=.. - fi -else - ac_srcdir_defaulted=no -fi -if test ! -r $srcdir/$ac_unique_file; then - if test "$ac_srcdir_defaulted" = yes; then - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 - { (exit 1); exit 1; }; } - else - { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 - { (exit 1); exit 1; }; } - fi -fi -(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || - { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 - { (exit 1); exit 1; }; } -srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -ac_env_build_alias_set=${build_alias+set} -ac_env_build_alias_value=$build_alias -ac_cv_env_build_alias_set=${build_alias+set} -ac_cv_env_build_alias_value=$build_alias -ac_env_host_alias_set=${host_alias+set} -ac_env_host_alias_value=$host_alias -ac_cv_env_host_alias_set=${host_alias+set} -ac_cv_env_host_alias_value=$host_alias -ac_env_target_alias_set=${target_alias+set} -ac_env_target_alias_value=$target_alias -ac_cv_env_target_alias_set=${target_alias+set} -ac_cv_env_target_alias_value=$target_alias -ac_env_CC_set=${CC+set} -ac_env_CC_value=$CC -ac_cv_env_CC_set=${CC+set} -ac_cv_env_CC_value=$CC -ac_env_CFLAGS_set=${CFLAGS+set} -ac_env_CFLAGS_value=$CFLAGS -ac_cv_env_CFLAGS_set=${CFLAGS+set} -ac_cv_env_CFLAGS_value=$CFLAGS -ac_env_LDFLAGS_set=${LDFLAGS+set} -ac_env_LDFLAGS_value=$LDFLAGS -ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -ac_cv_env_LDFLAGS_value=$LDFLAGS -ac_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_env_CPPFLAGS_value=$CPPFLAGS -ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -ac_cv_env_CPPFLAGS_value=$CPPFLAGS -ac_env_CPP_set=${CPP+set} -ac_env_CPP_value=$CPP -ac_cv_env_CPP_set=${CPP+set} -ac_cv_env_CPP_value=$CPP -ac_env_CXX_set=${CXX+set} -ac_env_CXX_value=$CXX -ac_cv_env_CXX_set=${CXX+set} -ac_cv_env_CXX_value=$CXX -ac_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_env_CXXFLAGS_value=$CXXFLAGS -ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} -ac_cv_env_CXXFLAGS_value=$CXXFLAGS -ac_env_CXXCPP_set=${CXXCPP+set} -ac_env_CXXCPP_value=$CXXCPP -ac_cv_env_CXXCPP_set=${CXXCPP+set} -ac_cv_env_CXXCPP_value=$CXXCPP -ac_env_F77_set=${F77+set} -ac_env_F77_value=$F77 -ac_cv_env_F77_set=${F77+set} -ac_cv_env_F77_value=$F77 -ac_env_FFLAGS_set=${FFLAGS+set} -ac_env_FFLAGS_value=$FFLAGS -ac_cv_env_FFLAGS_set=${FFLAGS+set} -ac_cv_env_FFLAGS_value=$FFLAGS - -# -# Report the --help message. -# -if test "$ac_init_help" = "long"; then - # Omit some internal or obsolete options to make the list less imposing. - # This message is too long to be a string in the A/UX 3.1 sh. - cat <<_ACEOF -\`configure' configures this package to adapt to many kinds of systems. - -Usage: $0 [OPTION]... [VAR=VALUE]... - -To assign environment variables (e.g., CC, CFLAGS...), specify them as -VAR=VALUE. See below for descriptions of some of the useful variables. - -Defaults for the options are specified in brackets. - -Configuration: - -h, --help display this help and exit - --help=short display options specific to this package - --help=recursive display the short help of all the included packages - -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages - --cache-file=FILE cache test results in FILE [disabled] - -C, --config-cache alias for \`--cache-file=config.cache' - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - -_ACEOF - - cat <<_ACEOF -Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] - -By default, \`make install' will install all the files in -\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -an installation prefix other than \`$ac_default_prefix' using \`--prefix', -for instance \`--prefix=\$HOME'. - -For better control, use the options below. - -Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --datadir=DIR read-only architecture-independent data [PREFIX/share] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --infodir=DIR info documentation [PREFIX/info] - --mandir=DIR man documentation [PREFIX/man] -_ACEOF - - cat <<\_ACEOF - -Program names: - --program-prefix=PREFIX prepend PREFIX to installed program names - --program-suffix=SUFFIX append SUFFIX to installed program names - --program-transform-name=PROGRAM run sed PROGRAM on installed program names - -X features: - --x-includes=DIR X include files are in DIR - --x-libraries=DIR X library files are in DIR - -System types: - --build=BUILD configure for building on BUILD [guessed] - --host=HOST cross-compile to build programs to run on HOST [BUILD] -_ACEOF -fi - -if test -n "$ac_init_help"; then - - cat <<\_ACEOF - -Optional Features: - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-shared[=PKGS] - build shared libraries [default=yes] - --enable-static[=PKGS] - build static libraries [default=yes] - --enable-fast-install[=PKGS] - optimize for fast installation [default=yes] - --disable-libtool-lock avoid locking (might break parallel builds) - --enable-lite disable some stuff (dont use it) - --disable-locale disable use of X locale support - --enable-modelock XKB keyboard language status support - --disable-shape disable shaped window extension support - --enable-xinerama enable Xinerama extension support - --disable-shm disable usage of MIT-SHM extension - --disable-xpm disable use of XPM pixmaps through libXpm - --disable-png disable PNG support through libpng - --disable-jpeg disable JPEG support through libjpeg - --disable-gif disable GIF support through libgif or libungif - --disable-tiff disable use of TIFF images through libtiff - --enable-usermenu user defined menus for applications - - -Optional Packages: - --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] - --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-gnu-ld assume the C compiler uses GNU ld [default=no] - --with-pic try to use only PIC/non-PIC objects [default=use - both] - --with-tags[=TAGS] - include additional configurations [automatic] - --with-libs-from pass compiler flags to look for libraries - --with-incs-from pass compiler flags to look for header files - --with-nlsdir=PATH specify where the locale stuff should go - --with-x use the X Window System - --with-pixmapdir=PATH specify where pixmaps are located DATADIR/pixmaps - --with-appspath=PATH specify the directory for GNUstep applications - -Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L if you have libraries in a - nonstandard directory - CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have - headers in a nonstandard directory - CPP C preprocessor - CXX C++ compiler command - CXXFLAGS C++ compiler flags - CXXCPP C++ preprocessor - F77 Fortran 77 compiler command - FFLAGS Fortran 77 compiler flags - -Use these variables to override the choices made by `configure' or to help -it to find libraries and programs with nonstandard names/locations. - -_ACEOF -fi - -if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. - ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d $ac_dir || continue - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - cd $ac_dir - # Check for guested configure; otherwise get Cygnus style configure. - if test -f $ac_srcdir/configure.gnu; then - echo - $SHELL $ac_srcdir/configure.gnu --help=recursive - elif test -f $ac_srcdir/configure; then - echo - $SHELL $ac_srcdir/configure --help=recursive - elif test -f $ac_srcdir/configure.ac || - test -f $ac_srcdir/configure.in; then - echo - $ac_configure --help - else - echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi - cd "$ac_popdir" - done -fi - -test -n "$ac_init_help" && exit 0 -if $ac_init_version; then - cat <<\_ACEOF - -Copyright (C) 2003 Free Software Foundation, Inc. -This configure script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it. -_ACEOF - exit 0 -fi -exec 5>config.log -cat >&5 <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was - - $ $0 $@ - -_ACEOF -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - echo "PATH: $as_dir" -done - -} >&5 - -cat >&5 <<_ACEOF - - -## ----------- ## -## Core tests. ## -## ----------- ## - -_ACEOF - - -# Keep a trace of the command line. -# Strip out --no-create and --no-recursion so they do not pile up. -# Strip out --silent because we don't want to record it for future runs. -# Also quote any args containing shell meta-characters. -# Make two passes to allow for proper duplicate-argument suppression. -ac_configure_args= -ac_configure_args0= -ac_configure_args1= -ac_sep= -ac_must_keep_next=false -for ac_pass in 1 2 -do - for ac_arg - do - case $ac_arg in - -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in - 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; - 2) - ac_configure_args1="$ac_configure_args1 '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else - case $ac_arg in - *=* | --config-cache | -C | -disable-* | --disable-* \ - | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ - | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ - | -with-* | --with-* | -without-* | --without-* | --x) - case "$ac_configure_args0 " in - "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; - esac - ;; - -* ) ac_must_keep_next=true ;; - esac - fi - ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" - # Get rid of the leading space. - ac_sep=" " - ;; - esac - done -done -$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } - -# When interrupted or exit'd, cleanup temporary files, and complete -# config.log. We remove comments because anyway the quotes in there -# would cause problems or look ugly. -# WARNING: Be sure not to use single quotes in there, as some shells, -# such as our DU 5.0 friend, will then `close' the trap. -trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { - echo - - cat <<\_ASBOX -## ---------------- ## -## Cache variables. ## -## ---------------- ## -_ASBOX - echo - # The following way of writing the cache mishandles newlines in values, -{ - (set) 2>&1 | - case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in - *ac_space=\ *) - sed -n \ - "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" - ;; - *) - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} - echo - - cat <<\_ASBOX -## ----------------- ## -## Output variables. ## -## ----------------- ## -_ASBOX - echo - for ac_var in $ac_subst_vars - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------- ## -## Output files. ## -## ------------- ## -_ASBOX - echo - for ac_var in $ac_subst_files - do - eval ac_val=$`echo $ac_var` - echo "$ac_var='"'"'$ac_val'"'"'" - done | sort - echo - fi - - if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## -## confdefs.h. ## -## ----------- ## -_ASBOX - echo - sed "/^$/d" confdefs.h | sort - echo - fi - test "$ac_signal" != 0 && - echo "$as_me: caught signal $ac_signal" - echo "$as_me: exit $exit_status" - } >&5 - rm -f core *.core && - rm -rf conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status - ' 0 -for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -done -ac_signal=0 - -# confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -rf conftest* confdefs.h -# AIX cpp loses on an empty file, so make sure it contains at least a newline. -echo >confdefs.h - -# Predefined preprocessor variables. - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_NAME "$PACKAGE_NAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_VERSION "$PACKAGE_VERSION" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_STRING "$PACKAGE_STRING" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF - - -# Let the site file select an alternate cache file if it wants to. -# Prefer explicitly selected file to automatically selected ones. -if test -z "$CONFIG_SITE"; then - if test "x$prefix" != xNONE; then - CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" - else - CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" - fi -fi -for ac_site_file in $CONFIG_SITE; do - if test -r "$ac_site_file"; then - { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -done - -if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then - { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in - [\\/]* | ?:[\\/]* ) . $cache_file;; - *) . ./$cache_file;; - esac - fi -else - { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file -fi - -# Check that the precious variables saved in the cache have kept the same -# value. -ac_cache_corrupted=false -for ac_var in `(set) 2>&1 | - sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val="\$ac_cv_env_${ac_var}_value" - eval ac_new_val="\$ac_env_${ac_var}_value" - case $ac_old_set,$ac_new_set in - set,) - { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) - { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then - { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -echo "$as_me: former value: $ac_old_val" >&2;} - { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -echo "$as_me: current value: $ac_new_val" >&2;} - ac_cache_corrupted=: - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in - *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) - ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; - esac - fi -done -if $ac_cache_corrupted; then - { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -echo "$as_me: error: changes in the environment can compromise the build" >&2;} - { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - - - - - - - - - - - - - - - - - - - - -am__api_version="1.4" -ac_aux_dir= -for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do - if test -f $ac_dir/install-sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install-sh -c" - break - elif test -f $ac_dir/install.sh; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/install.sh -c" - break - elif test -f $ac_dir/shtool; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/shtool install -c" - break - fi -done -if test -z "$ac_aux_dir"; then - { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} - { (exit 1); exit 1; }; } -fi -ac_config_guess="$SHELL $ac_aux_dir/config.guess" -ac_config_sub="$SHELL $ac_aux_dir/config.sub" -ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. - -# Find a good install program. We prefer a C program (faster), -# so one script is as good as another. But avoid the broken or -# incompatible versions: -# SysV /etc/install, /usr/sbin/install -# SunOS /usr/etc/install -# IRIX /sbin/install -# AIX /bin/install -# AmigaOS /C/install, which installs bootblocks on floppy discs -# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -# AFS /usr/afsws/bin/install, which mishandles nonexistent args -# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -# OS/2's system install, which has a completely different semantic -# ./install, which can be erroneously created by make from ./install.sh. -echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -if test -z "$INSTALL"; then -if test "${ac_cv_path_install+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - # Account for people who put trailing slashes in PATH elements. -case $as_dir/ in - ./ | .// | /cC/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ - ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. - # Don't use installbsd from OSF since it installs stuff as root - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. - : - elif test $ac_prog = install && - grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # program-specific install script used by HP pwplus--don't use. - : - else - ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" - break 3 - fi - fi - done - done - ;; -esac -done - - -fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else - # As a last resort, use the slow shell script. We don't cache a - # path for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is - # removed, or if the path is relative. - INSTALL=$ac_install_sh - fi -fi -echo "$as_me:$LINENO: result: $INSTALL" >&5 -echo "${ECHO_T}$INSTALL" >&6 - -# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -# It thinks the first close brace ends the variable substitution. -test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' - -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - -echo "$as_me:$LINENO: checking whether build environment is sane" >&5 -echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6 -# Just in case -sleep 1 -echo timestamp > conftestfile -# Do `set' in a subshell so we don't clobber the current shell's -# arguments. Must try -L first in case configure is actually a -# symlink; some systems play weird games with the mod time of symlinks -# (eg FreeBSD returns the mod time of the symlink's containing -# directory). -if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` - fi - if test "$*" != "X $srcdir/configure conftestfile" \ - && test "$*" != "X conftestfile $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&5 -echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken -alias in your environment" >&2;} - { (exit 1); exit 1; }; } - fi - - test "$2" = conftestfile - ) -then - # Ok. - : -else - { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! -Check your system clock" >&5 -echo "$as_me: error: newly created file is older than distributed files! -Check your system clock" >&2;} - { (exit 1); exit 1; }; } -fi -rm -f conftest* -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -test "$program_prefix" != NONE && - program_transform_name="s,^,$program_prefix,;$program_transform_name" -# Use a double $ so make ignores it. -test "$program_suffix" != NONE && - program_transform_name="s,\$,$program_suffix,;$program_transform_name" -# Double any \ or $. echo might interpret backslashes. -# By default was `s,x,x', remove it if useless. -cat <<\_ACEOF >conftest.sed -s/[\\$]/&&/g;s/;s,x,x,$// -_ACEOF -program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -rm conftest.sed - -echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.make <<\_ACEOF -all: - @echo 'ac_maketemp="$(MAKE)"' -_ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -if test -n "$ac_maketemp"; then - eval ac_cv_prog_make_${ac_make}_set=yes -else - eval ac_cv_prog_make_${ac_make}_set=no -fi -rm -f conftest.make -fi -if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - SET_MAKE= -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - SET_MAKE="MAKE=${MAKE-make}" -fi - - -PACKAGE=WindowMaker - -VERSION=0.91.0 - -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then - { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 -echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} - { (exit 1); exit 1; }; } -fi - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF - - -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - - - -missing_dir=`cd $ac_aux_dir && pwd` -echo "$as_me:$LINENO: checking for working aclocal-${am__api_version}" >&5 -echo $ECHO_N "checking for working aclocal-${am__api_version}... $ECHO_C" >&6 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (aclocal-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then - ACLOCAL=aclocal-${am__api_version} - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 -else - ACLOCAL="$missing_dir/missing aclocal-${am__api_version}" - echo "$as_me:$LINENO: result: missing" >&5 -echo "${ECHO_T}missing" >&6 -fi - -echo "$as_me:$LINENO: checking for working autoconf" >&5 -echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoconf --version) < /dev/null > /dev/null 2>&1; then - AUTOCONF=autoconf - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 -else - AUTOCONF="$missing_dir/missing autoconf" - echo "$as_me:$LINENO: result: missing" >&5 -echo "${ECHO_T}missing" >&6 -fi - -echo "$as_me:$LINENO: checking for working automake-${am__api_version}" >&5 -echo $ECHO_N "checking for working automake-${am__api_version}... $ECHO_C" >&6 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (automake-${am__api_version} --version) < /dev/null > /dev/null 2>&1; then - AUTOMAKE=automake-${am__api_version} - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 -else - AUTOMAKE="$missing_dir/missing automake-${am__api_version}" - echo "$as_me:$LINENO: result: missing" >&5 -echo "${ECHO_T}missing" >&6 -fi - -echo "$as_me:$LINENO: checking for working autoheader" >&5 -echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (autoheader --version) < /dev/null > /dev/null 2>&1; then - AUTOHEADER=autoheader - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 -else - AUTOHEADER="$missing_dir/missing autoheader" - echo "$as_me:$LINENO: result: missing" >&5 -echo "${ECHO_T}missing" >&6 -fi - -echo "$as_me:$LINENO: checking for working makeinfo" >&5 -echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6 -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if (makeinfo --version) < /dev/null > /dev/null 2>&1; then - MAKEINFO=makeinfo - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 -else - MAKEINFO="$missing_dir/missing makeinfo" - echo "$as_me:$LINENO: result: missing" >&5 -echo "${ECHO_T}missing" >&6 -fi - - - -# Check whether --enable-shared or --disable-shared was given. -if test "${enable_shared+set}" = set; then - enableval="$enable_shared" - p=${PACKAGE-default} - case $enableval in - yes) enable_shared=yes ;; - no) enable_shared=no ;; - *) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_shared=yes -fi; - -# Check whether --enable-static or --disable-static was given. -if test "${enable_static+set}" = set; then - enableval="$enable_static" - p=${PACKAGE-default} - case $enableval in - yes) enable_static=yes ;; - no) enable_static=no ;; - *) - enable_static=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_static=yes -fi; - -# Check whether --enable-fast-install or --disable-fast-install was given. -if test "${enable_fast_install+set}" = set; then - enableval="$enable_fast_install" - p=${PACKAGE-default} - case $enableval in - yes) enable_fast_install=yes ;; - no) enable_fast_install=no ;; - *) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for pkg in $enableval; do - IFS="$lt_save_ifs" - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$lt_save_ifs" - ;; - esac -else - enable_fast_install=yes -fi; - -# Make sure we can run config.sub. -$ac_config_sub sun4 >/dev/null 2>&1 || - { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -echo "$as_me: error: cannot run $ac_config_sub" >&2;} - { (exit 1); exit 1; }; } - -echo "$as_me:$LINENO: checking build system type" >&5 -echo $ECHO_N "checking build system type... $ECHO_C" >&6 -if test "${ac_cv_build+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_build_alias=$build_alias -test -z "$ac_cv_build_alias" && - ac_cv_build_alias=`$ac_config_guess` -test -z "$ac_cv_build_alias" && - { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -echo "$as_me: error: cannot guess build type; you must specify one" >&2;} - { (exit 1); exit 1; }; } -ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -echo "${ECHO_T}$ac_cv_build" >&6 -build=$ac_cv_build -build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -echo "$as_me:$LINENO: checking host system type" >&5 -echo $ECHO_N "checking host system type... $ECHO_C" >&6 -if test "${ac_cv_host+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_host_alias=$host_alias -test -z "$ac_cv_host_alias" && - ac_cv_host_alias=$ac_cv_build_alias -ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || - { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} - { (exit 1); exit 1; }; } - -fi -echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -echo "${ECHO_T}$ac_cv_host" >&6 -host=$ac_cv_host -host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_CC" && break -done - - CC=$ac_ct_CC -fi - -fi - - -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.exe b.out" -# Try to create an executable without -o first, disregard a.out. -# It will help us diagnose broken compilers, and finding out an intuition -# of exeext. -echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 -ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 - (eval $ac_link_default) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Find the output, starting from the most likely. This scheme is -# not robust to junk in `.', hence go to wildcards (a.*) only as a last -# resort. - -# Be careful to initialize this variable, since it used to be cached. -# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -ac_cv_exeext= -# b.out is created by i960 compilers. -for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) - ;; - conftest.$ac_ext ) - # This is the source file. - ;; - [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - # FIXME: I believe we export ac_cv_exeext for Libtool, - # but it would be cool to find out if it's true. Does anybody - # maintain Libtool? --akim. - export ac_cv_exeext - break;; - * ) - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -See \`config.log' for more details." >&5 -echo "$as_me: error: C compiler cannot create executables -See \`config.log' for more details." >&2;} - { (exit 77); exit 77; }; } -fi - -ac_exeext=$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6 - -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -# If not cross compiling, check that we can run a simple program. -if test "$cross_compiling" != yes; then - if { ac_try='./$ac_file' - { (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 - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - fi - fi -fi -echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - -rm -f a.out a.exe conftest$ac_cv_exeext b.out -ac_clean_files=$ac_clean_files_save -# Check the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $cross_compiling" >&5 -echo "${ECHO_T}$cross_compiling" >&6 - -echo "$as_me:$LINENO: checking for suffix of executables" >&5 -echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -if { (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); }; then - # If both `conftest.exe' and `conftest' are `present' (well, observable) -# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -# work properly (i.e., refer to `conftest.exe'), while it won't with -# `rm'. -for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - export ac_cv_exeext - break;; - * ) break;; - esac -done -else - { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest$ac_cv_exeext -echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -echo "${ECHO_T}$ac_cv_exeext" >&6 - -rm -f conftest.$ac_ext -EXEEXT=$ac_cv_exeext -ac_exeext=$EXEEXT -echo "$as_me:$LINENO: checking for suffix of object files" >&5 -echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -if test "${ac_cv_objext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.o conftest.obj -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 - for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac -done -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&5 -echo "$as_me: error: cannot compute suffix of object files: cannot compile -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -rm -f conftest.$ac_cv_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -echo "${ECHO_T}$ac_cv_objext" >&6 -OBJEXT=$ac_cv_objext -ac_objext=$OBJEXT -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_prog_cc_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC - -fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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 - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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 - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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 - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5 -echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6 -if test "${lt_cv_path_SED+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Loop through the user's path and test for sed and gsed. -# Then use that list of sed's as ones to test for truncation. -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for lt_ac_prog in sed gsed; do - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then - lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi - done - done -done -lt_ac_max=0 -lt_ac_count=0 -# Add /usr/xpg4/bin/sed as it is typically found on Solaris -# along with /bin/sed that truncates output. -for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do - test ! -f $lt_ac_sed && break - cat /dev/null > conftest.in - lt_ac_count=0 - echo $ECHO_N "0123456789$ECHO_C" >conftest.in - # Check for GNU sed and select it if it is found. - if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then - lt_cv_path_SED=$lt_ac_sed - break - fi - while true; do - cat conftest.in conftest.in >conftest.tmp - mv conftest.tmp conftest.in - cp conftest.in conftest.nl - echo >>conftest.nl - $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break - cmp -s conftest.out conftest.nl || break - # 10000 chars as input seems more than enough - test $lt_ac_count -gt 10 && break - lt_ac_count=`expr $lt_ac_count + 1` - if test $lt_ac_count -gt $lt_ac_max; then - lt_ac_max=$lt_ac_count - lt_cv_path_SED=$lt_ac_sed - fi - done -done -SED=$lt_cv_path_SED - -fi - -echo "$as_me:$LINENO: result: $SED" >&5 -echo "${ECHO_T}$SED" >&6 - -echo "$as_me:$LINENO: checking for egrep" >&5 -echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -if test "${ac_cv_prog_egrep+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if echo a | (grep -E '(a|b)') >/dev/null 2>&1 - then ac_cv_prog_egrep='grep -E' - else ac_cv_prog_egrep='egrep' - fi -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -echo "${ECHO_T}$ac_cv_prog_egrep" >&6 - EGREP=$ac_cv_prog_egrep - - - -# Check whether --with-gnu-ld or --without-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi; -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 -else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 -fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -echo "${ECHO_T}$LD" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 -with_gnu_ld=$lt_cv_prog_gnu_ld - - -echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5 -echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6 -if test "${lt_cv_ld_reload_flag+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_ld_reload_flag='-r' -fi -echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5 -echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6 -reload_flag=$lt_cv_ld_reload_flag -case $reload_flag in -"" | " "*) ;; -*) reload_flag=" $reload_flag" ;; -esac -reload_cmds='$LD$reload_flag -o $output$reload_objs' - -echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5 -echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6 -if test "${lt_cv_path_NM+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$NM"; then - # 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" - 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 - fi - done - IFS="$lt_save_ifs" - test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm -fi -fi -echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5 -echo "${ECHO_T}$lt_cv_path_NM" >&6 -NM="$lt_cv_path_NM" - -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 -fi - -echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5 -echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6 -if test "${lt_cv_deplibs_check_method+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_file_magic_cmd='$MAGIC_CMD' -lt_cv_file_magic_test_file= -lt_cv_deplibs_check_method='unknown' -# Need to set the preceding variable on all platforms that support -# interlibrary dependencies. -# 'none' -- dependencies not supported. -# `unknown' -- same as none, but documents that we really don't know. -# 'pass_all' -- all dependencies passed with no checks. -# 'test_compile' -- check by making test program. -# 'file_magic [[regex]]' -- check by looking for files in library path -# which responds to the $file_magic_cmd with a given extended regex. -# If you have `file' or equivalent on your system and you're not sure -# whether `pass_all' will *always* work, you probably want this one. - -case $host_os in -aix4* | aix5*) - lt_cv_deplibs_check_method=pass_all - ;; - -beos*) - lt_cv_deplibs_check_method=pass_all - ;; - -bsdi4*) - 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 - ;; - -cygwin*) - # func_win32_libid is a shell function defined in ltmain.sh - lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' - lt_cv_file_magic_cmd='func_win32_libid' - ;; - -mingw* | pw32*) - # Base MSYS/MinGW do not provide the 'file' command needed by - # func_win32_libid shell function, so use a weaker test based on 'objdump'. - lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' - lt_cv_file_magic_cmd='$OBJDUMP -f' - ;; - -darwin* | rhapsody*) - lt_cv_deplibs_check_method=pass_all - ;; - -freebsd* | kfreebsd*-gnu) - 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_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` - ;; - esac - else - lt_cv_deplibs_check_method=pass_all - fi - ;; - -gnu*) - lt_cv_deplibs_check_method=pass_all - ;; - -hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file - case "$host_cpu" in - ia64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64' - lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so - ;; - hppa*64*) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]' - lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl - ;; - *) - lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library' - lt_cv_file_magic_test_file=/usr/lib/libc.sl - ;; - esac - ;; - -irix5* | irix6* | nonstopux*) - case $LD in - *-32|*"-32 ") libmagic=32-bit;; - *-n32|*"-n32 ") libmagic=N32;; - *-64|*"-64 ") libmagic=64-bit;; - *) libmagic=never-match;; - esac - lt_cv_deplibs_check_method=pass_all - ;; - -# This must be Linux ELF. -linux*) - lt_cv_deplibs_check_method=pass_all - ;; - -netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' - else - lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$' - fi - ;; - -newos6*) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file - lt_cv_file_magic_test_file=/usr/lib/libnls.so - ;; - -nto-qnx*) - lt_cv_deplibs_check_method=unknown - ;; - -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' - else - lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library' - fi - ;; - -osf3* | osf4* | osf5*) - 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*) - case $host_vendor in - motorola) - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]' - lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` - ;; - ncr) - lt_cv_deplibs_check_method=pass_all - ;; - sequent) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' - ;; - sni) - lt_cv_file_magic_cmd='/bin/file' - lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib" - lt_cv_file_magic_test_file=/lib/libc.so - ;; - siemens) - lt_cv_deplibs_check_method=pass_all - ;; - esac - ;; - -sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*) - lt_cv_deplibs_check_method=pass_all - ;; -esac - -fi -echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5 -echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6 -file_magic_cmd=$lt_cv_file_magic_cmd -deplibs_check_method=$lt_cv_deplibs_check_method -test -z "$deplibs_check_method" && deplibs_check_method=unknown - - - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" - -fi; -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case $host in -ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" - ;; - *ELF-64*) - HPUX_IA64_MODE="64" - ;; - esac - fi - rm -rf conftest* - ;; -*-*-irix6*) - # Find out which ABI we are using. - echo '#line 3336 "configure"' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -melf32bsmip" - ;; - *N32*) - LD="${LD-ld} -melf32bmipn32" - ;; - *64-bit*) - LD="${LD-ld} -melf64bmip" - ;; - esac - else - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - fi - rm -rf conftest* - ;; - -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - case "`/usr/bin/file conftest.o`" in - *32-bit*) - case $host in - x86_64-*linux*) - LD="${LD-ld} -m elf_i386" - ;; - ppc64-*linux*|powerpc64-*linux*) - LD="${LD-ld} -m elf32ppclinux" - ;; - s390x-*linux*) - LD="${LD-ld} -m elf_s390" - ;; - sparc64-*linux*) - LD="${LD-ld} -m elf32_sparc" - ;; - esac - ;; - *64-bit*) - case $host in - x86_64-*linux*) - LD="${LD-ld} -m elf_x86_64" - ;; - ppc*-*linux*|powerpc*-*linux*) - LD="${LD-ld} -m elf64ppc" - ;; - s390*-*linux*) - LD="${LD-ld} -m elf64_s390" - ;; - sparc*-*linux*) - LD="${LD-ld} -m elf64_sparc" - ;; - esac - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5 -echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6 -if test "${lt_cv_cc_needs_belf+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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 - lt_cv_cc_needs_belf=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -lt_cv_cc_needs_belf=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5 -echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6 - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; - -esac - -need_locks="$enable_libtool_lock" - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -# On Suns, sometimes $CPP names a directory. -if test -n "$CPP" && test -d "$CPP"; then - CPP= -fi -if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" - do - ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CPP=$CPP - -fi - CPP=$ac_cv_prog_CPP -else - ac_cv_prog_CPP=$CPP -fi -echo "$as_me:$LINENO: result: $CPP" >&5 -echo "${ECHO_T}$CPP" >&6 -ac_preproc_ok=false -for ac_c_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -if test "${ac_cv_header_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_header_stdc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_stdc=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then - : -else - ac_cv_header_stdc=no -fi -rm -f conftest* - -fi - -if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then - : -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#if ((' ' & 0x0FF) == 0x020) -# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -#else -# define ISLOWER(c) \ - (('a' <= (c) && (c) <= 'i') \ - || ('j' <= (c) && (c) <= 'r') \ - || ('s' <= (c) && (c) <= 'z')) -# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -#endif - -#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -int -main () -{ - int i; - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) - exit(2); - exit (0); -} -_ACEOF -rm -f conftest$ac_exeext -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); } && { ac_try='./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 - : -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_header_stdc=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -echo "${ECHO_T}$ac_cv_header_stdc" >&6 -if test $ac_cv_header_stdc = yes; then - -cat >>confdefs.h <<\_ACEOF -#define STDC_HEADERS 1 -_ACEOF - -fi - -# On IRIX 5.3, sys/types and inttypes.h are conflicting. - - - - - - - - - -for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+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. */ -$ac_includes_default - -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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 - eval "$as_ac_Header=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Header=no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - -for ac_header in dlfcn.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -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' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CXX"; then - ac_cv_prog_CXX="$CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CXX=$ac_cv_prog_CXX -if test -n "$CXX"; then - echo "$as_me:$LINENO: result: $CXX" >&5 -echo "${ECHO_T}$CXX" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$CXX" && break - done -fi -if test -z "$CXX"; then - ac_ct_CXX=$CXX - for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CXX"; then - ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CXX="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CXX=$ac_cv_prog_ac_ct_CXX -if test -n "$ac_ct_CXX"; then - echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 -echo "${ECHO_T}$ac_ct_CXX" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_CXX" && break -done -test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - - CXX=$ac_ct_CXX -fi - - -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C++ compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_cxx_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 -GXX=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CXXFLAGS=${CXXFLAGS+set} -ac_save_CXXFLAGS=$CXXFLAGS -CXXFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 -echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cxx_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_prog_cxx_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_prog_cxx_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi -else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi -fi -for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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 - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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 - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -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' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - -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' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 -echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 -if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # Double quotes because CXXCPP needs to be expanded - for CXXCPP in "$CXX -E" "/lib/cpp" - do - ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - break -fi - - done - ac_cv_prog_CXXCPP=$CXXCPP - -fi - CXXCPP=$ac_cv_prog_CXXCPP -else - ac_cv_prog_CXXCPP=$CXXCPP -fi -echo "$as_me:$LINENO: result: $CXXCPP" >&5 -echo "${ECHO_T}$CXXCPP" >&6 -ac_preproc_ok=false -for ac_cxx_preproc_warn_flag in '' yes -do - # Use a header file that comes with gcc, so configuring glibc - # with a fresh cross-compiler works. - # Prefer to if __STDC__ is defined, since - # exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#ifdef __STDC__ -# include -#else -# include -#endif - Syntax error -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Broken: fails on valid input. -continue -fi -rm -f conftest.err conftest.$ac_ext - - # OK, works on sane cases. Now check whether non-existent headers - # can be detected and how. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_cxx_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # Broken: success on invalid input. -continue -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - # Passes both tests. -ac_preproc_ok=: -break -fi -rm -f conftest.err conftest.$ac_ext - -done -# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then - : -else - { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&5 -echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } -fi - -ac_ext=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' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu -if test -n "$ac_tool_prefix"; then - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$F77"; then - ac_cv_prog_F77="$F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_F77="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -F77=$ac_cv_prog_F77 -if test -n "$F77"; then - echo "$as_me:$LINENO: result: $F77" >&5 -echo "${ECHO_T}$F77" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$F77" && break - done -fi -if test -z "$F77"; then - ac_ct_F77=$F77 - for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_F77"; then - ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_F77="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_F77=$ac_cv_prog_ac_ct_F77 -if test -n "$ac_ct_F77"; then - echo "$as_me:$LINENO: result: $ac_ct_F77" >&5 -echo "${ECHO_T}$ac_ct_F77" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_F77" && break -done - - F77=$ac_ct_F77 -fi - - -# Provide some information about the compiler. -echo "$as_me:4791:" \ - "checking for Fortran 77 compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -rm -f a.out - -# If we don't use `.F' as extension, the preprocessor is not run on the -# input file. (Note that this only needs to work for GNU compilers.) -ac_save_ext=$ac_ext -ac_ext=F -echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6 -if test "${ac_cv_f77_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF - program main -#ifndef __GNUC__ - choke me -#endif - - end -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_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_objext' - { (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_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_f77_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6 -ac_ext=$ac_save_ext -ac_test_FFLAGS=${FFLAGS+set} -ac_save_FFLAGS=$FFLAGS -FFLAGS= -echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5 -echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_f77_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - FFLAGS=-g -cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_f77_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_objext' - { (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_prog_f77_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_prog_f77_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5 -echo "${ECHO_T}$ac_cv_prog_f77_g" >&6 -if test "$ac_test_FFLAGS" = set; then - FFLAGS=$ac_save_FFLAGS -elif test $ac_cv_prog_f77_g = yes; then - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-g -O2" - else - FFLAGS="-g" - fi -else - if test "x$ac_cv_f77_compiler_gnu" = xyes; then - FFLAGS="-O2" - else - FFLAGS= - fi -fi - -G77=`test $ac_compiler_gnu = yes && echo yes` -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - - -# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - -# find the maximum length of command line arguments -echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5 -echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6 -if test "${lt_cv_sys_max_cmd_len+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - i=0 - teststring="ABCD" - - case $build_os in - msdosdjgpp*) - # On DJGPP, this test can blow up pretty badly due to problems in libc - # (any single argument exceeding 2000 bytes causes a buffer overrun - # during glob expansion). Even if it were fixed, the result of this - # check would be larger than it should be. - lt_cv_sys_max_cmd_len=12288; # 12K is about right - ;; - - gnu*) - # Under GNU Hurd, this test is not required because there is - # no limit to the length of command line arguments. - # Libtool will interpret -1 as no limit whatsoever - lt_cv_sys_max_cmd_len=-1; - ;; - - cygwin* | mingw*) - # On Win9x/ME, this test blows up -- it succeeds, but takes - # about 5 minutes as the teststring grows exponentially. - # Worse, since 9x/ME are not pre-emptively multitasking, - # you end up with a "frozen" computer, even though with patience - # the test eventually succeeds (with a max line length of 256k). - # Instead, let's just punt: use the minimum linelength reported by - # all of the supported platforms: 8192 (on NT/2K/XP). - lt_cv_sys_max_cmd_len=8192; - ;; - - amigaos*) - # On AmigaOS with pdksh, this test takes hours, literally. - # So we just punt and use a minimum line length of 8192. - lt_cv_sys_max_cmd_len=8192; - ;; - - *) - # 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` \ - = "XX$teststring") >/dev/null 2>&1 && - new_result=`expr "X$teststring" : ".*" 2>&1` && - lt_cv_sys_max_cmd_len=$new_result && - test $i != 17 # 1/2 MB should be enough - do - i=`expr $i + 1` - teststring=$teststring$teststring - done - teststring= - # Add a significant safety factor because C++ compilers can tack on massive - # amounts of additional arguments before passing them to the linker. - # It appears as though 1/2 is a usable value. - lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` - ;; - esac - -fi - -if test -n $lt_cv_sys_max_cmd_len ; then - echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5 -echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6 -else - echo "$as_me:$LINENO: result: none" >&5 -echo "${ECHO_T}none" >&6 -fi - - - - -# Check for command to grab the raw symbol name followed by C symbol from nm. -echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5 -echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6 -if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -# These are sane defaults that work on at least a few old systems. -# [They come from Ultrix. What could be older than Ultrix?!! ;)] - -# Character class describing NM global symbol codes. -symcode='[BCDEGRST]' - -# 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'" - -# Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - -# Define system-specific variables. -case $host_os in -aix*) - symcode='[BCDT]' - ;; -cygwin* | mingw* | pw32*) - symcode='[ABCDGISTW]' - ;; -hpux*) # Its linker distinguishes data from code symbols - if test "$host_cpu" = ia64; then - symcode='[ABCDEGRST]' - fi - lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" - lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'" - ;; -irix* | nonstopux*) - symcode='[BCDEGRST]' - ;; -osf*) - symcode='[BCDEGQRST]' - ;; -solaris* | sysv5*) - symcode='[BDRT]' - ;; -sysv4) - symcode='[DFNSTU]' - ;; -esac - -# Handle CRLF in mingw tool chain -opt_cr= -case $build_os in -mingw*) - opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp - ;; -esac - -# If we're using GNU nm, then use its standard symbol codes. -case `$NM -V 2>&1` in -*GNU* | *'with BFD'*) - symcode='[ABCDGIRSTW]' ;; -esac - -# Try without a prefix undercore, then with it. -for ac_symprfx in "" "_"; do - - # 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'" - - # Check to see that the pipe works correctly. - pipe_works=no - - rm -f conftest* - cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Now try to grab the symbols. - nlist=conftest.nm - if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5 - (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" - else - rm -f "$nlist"T - fi - - # Make sure that we snagged all the symbols we need. - if grep ' nm_test_var$' "$nlist" >/dev/null; then - if grep ' nm_test_func$' "$nlist" >/dev/null; then - cat < conftest.$ac_ext -#ifdef __cplusplus -extern "C" { -#endif - -EOF - # Now generate the symbol file. - eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext' - - cat <> conftest.$ac_ext -#if defined (__STDC__) && __STDC__ -# define lt_ptr_t void * -#else -# define lt_ptr_t char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr_t address; -} -lt_preloaded_symbols[] = -{ -EOF - $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext - cat <<\EOF >> conftest.$ac_ext - {0, (lt_ptr_t) 0} -}; - -#ifdef __cplusplus -} -#endif -EOF - # Now try linking the two files. - mv conftest.$ac_objext conftstm.$ac_objext - lt_save_LIBS="$LIBS" - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" - 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}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" - CFLAGS="$lt_save_CFLAGS" - else - echo "cannot find nm_test_func in $nlist" >&5 - fi - else - echo "cannot find nm_test_var in $nlist" >&5 - fi - else - echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5 - fi - else - echo "$progname: failed program was:" >&5 - cat conftest.$ac_ext >&5 - fi - rm -f conftest* conftst* - - # Do not use the global_symbol_pipe unless it works. - if test "$pipe_works" = yes; then - break - else - lt_cv_sys_global_symbol_pipe= - fi -done - -fi - -if test -z "$lt_cv_sys_global_symbol_pipe"; then - lt_cv_sys_global_symbol_to_cdecl= -fi -if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then - echo "$as_me:$LINENO: result: failed" >&5 -echo "${ECHO_T}failed" >&6 -else - echo "$as_me:$LINENO: result: ok" >&5 -echo "${ECHO_T}ok" >&6 -fi - -echo "$as_me:$LINENO: checking for objdir" >&5 -echo $ECHO_N "checking for objdir... $ECHO_C" >&6 -if test "${lt_cv_objdir+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - rm -f .libs 2>/dev/null -mkdir .libs 2>/dev/null -if test -d .libs; then - lt_cv_objdir=.libs -else - # MS-DOS does not allow filenames that begin with a dot. - lt_cv_objdir=_libs -fi -rmdir .libs 2>/dev/null -fi -echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5 -echo "${ECHO_T}$lt_cv_objdir" >&6 -objdir=$lt_cv_objdir - - - - - -case $host_os in -aix3*) - # AIX sometimes has problems with the GCC collect2 program. For some - # reason, if we set the COLLECT_NAMES environment variable, the problems - # vanish in a puff of smoke. - if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES - fi - ;; -esac - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='sed -e s/^X//' -sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g' - -# Same as above, but do not quote variable references. -double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g' - -# Sed substitution to delay expansion of an escaped shell variable in a -# double_quote_subst'ed string. -delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' - -# Sed substitution to avoid accidental globbing in evaled expressions -no_glob_subst='s/\*/\\\*/g' - -# Constants: -rm="rm -f" - -# Global variables: -default_ofile=libtool -can_build_shared=yes - -# All known linkers require a `.a' archive for static linking (except M$VC, -# which needs '.lib'). -libext=a -ltmain="$ac_aux_dir/ltmain.sh" -ofile="$default_ofile" -with_gnu_ld="$lt_cv_prog_gnu_ld" - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. -set dummy ${ac_tool_prefix}ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$AR"; then - ac_cv_prog_AR="$AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_AR="${ac_tool_prefix}ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -AR=$ac_cv_prog_AR -if test -n "$AR"; then - echo "$as_me:$LINENO: result: $AR" >&5 -echo "${ECHO_T}$AR" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_AR"; then - ac_ct_AR=$AR - # Extract the first word of "ar", so it can be a program name with args. -set dummy ar; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_AR+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_AR"; then - ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_AR="ar" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false" -fi -fi -ac_ct_AR=$ac_cv_prog_ac_ct_AR -if test -n "$ac_ct_AR"; then - echo "$as_me:$LINENO: result: $ac_ct_AR" >&5 -echo "${ECHO_T}$ac_ct_AR" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - AR=$ac_ct_AR -else - AR="$ac_cv_prog_AR" -fi - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -RANLIB=$ac_cv_prog_RANLIB -if test -n "$RANLIB"; then - echo "$as_me:$LINENO: result: $RANLIB" >&5 -echo "${ECHO_T}$RANLIB" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. -set dummy ranlib; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_RANLIB="ranlib" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -fi -fi -ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -if test -n "$ac_ct_RANLIB"; then - echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -echo "${ECHO_T}$ac_ct_RANLIB" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - RANLIB=$ac_ct_RANLIB -else - RANLIB="$ac_cv_prog_RANLIB" -fi - -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. -set dummy ${ac_tool_prefix}strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$STRIP"; then - ac_cv_prog_STRIP="$STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_STRIP="${ac_tool_prefix}strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -STRIP=$ac_cv_prog_STRIP -if test -n "$STRIP"; then - echo "$as_me:$LINENO: result: $STRIP" >&5 -echo "${ECHO_T}$STRIP" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_STRIP"; then - ac_ct_STRIP=$STRIP - # Extract the first word of "strip", so it can be a program name with args. -set dummy strip; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_STRIP"; then - ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_STRIP="strip" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":" -fi -fi -ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP -if test -n "$ac_ct_STRIP"; then - echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 -echo "${ECHO_T}$ac_ct_STRIP" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - STRIP=$ac_ct_STRIP -else - STRIP="$ac_cv_prog_STRIP" -fi - - -old_CC="$CC" -old_CFLAGS="$CFLAGS" - -# Set sane defaults for various variables -test -z "$AR" && AR=ar -test -z "$AR_FLAGS" && AR_FLAGS=cru -test -z "$AS" && AS=as -test -z "$CC" && CC=cc -test -z "$LTCC" && LTCC=$CC -test -z "$DLLTOOL" && DLLTOOL=dlltool -test -z "$LD" && LD=ld -test -z "$LN_S" && LN_S="ln -s" -test -z "$MAGIC_CMD" && MAGIC_CMD=file -test -z "$NM" && NM=nm -test -z "$SED" && SED=sed -test -z "$OBJDUMP" && OBJDUMP=objdump -test -z "$RANLIB" && RANLIB=: -test -z "$STRIP" && STRIP=: -test -z "$ac_objext" && ac_objext=o - -# Determine commands to create old-style static archives. -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs' -old_postinstall_cmds='chmod 644 $oldlib' -old_postuninstall_cmds= - -if test -n "$RANLIB"; then - case $host_os in - openbsd*) - old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds" - ;; - *) - old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds" - ;; - esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -fi - -# Only perform the check for file, if the check method requires it -case $deplibs_check_method in -file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5 -echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/${ac_tool_prefix}file; then - lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - echo "$as_me:$LINENO: checking for file" >&5 -echo $ECHO_N "checking for file... $ECHO_C" >&6 -if test "${lt_cv_path_MAGIC_CMD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $MAGIC_CMD in -[\\/*] | ?:[\\/]*) - lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. - ;; -*) - lt_save_MAGIC_CMD="$MAGIC_CMD" - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - ac_dummy="/usr/bin$PATH_SEPARATOR$PATH" - for ac_dir in $ac_dummy; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/file; then - lt_cv_path_MAGIC_CMD="$ac_dir/file" - if test -n "$file_magic_test_file"; then - case $deplibs_check_method in - "file_magic "*) - file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`" - MAGIC_CMD="$lt_cv_path_MAGIC_CMD" - if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | - $EGREP "$file_magic_regex" > /dev/null; then - : - else - cat <&2 - -*** Warning: the command libtool uses to detect shared libraries, -*** $file_magic_cmd, produces output that libtool cannot recognize. -*** The result is that libtool may fail to recognize shared libraries -*** as such. This will affect the creation of libtool libraries that -*** depend on shared libraries, but programs linked with such libtool -*** libraries will work regardless of this problem. Nevertheless, you -*** may want to report the problem to your system manager and/or to -*** bug-libtool@gnu.org - -EOF - fi ;; - esac - fi - break - fi - done - IFS="$lt_save_ifs" - MAGIC_CMD="$lt_save_MAGIC_CMD" - ;; -esac -fi - -MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -if test -n "$MAGIC_CMD"; then - echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5 -echo "${ECHO_T}$MAGIC_CMD" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - else - MAGIC_CMD=: - fi -fi - - fi - ;; -esac - -enable_dlopen=no -enable_win32_dll=no - -# Check whether --enable-libtool-lock or --disable-libtool-lock was given. -if test "${enable_libtool_lock+set}" = set; then - enableval="$enable_libtool_lock" - -fi; -test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes - - -# Check whether --with-pic or --without-pic was given. -if test "${with_pic+set}" = set; then - withval="$with_pic" - pic_mode="$withval" -else - pic_mode=default -fi; -test -z "$pic_mode" && pic_mode=default - -# Use C for the default configuration in the libtool script -tagname= -lt_save_CC="$CC" -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -# Source file extension for C test sources. -ac_ext=c - -# Object file extension for compiled C test sources. -objext=o -objext=$objext - -# Code to be used in simple compile tests -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(){return(0);}\n' - - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# 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 - - - - -lt_prog_compiler_no_builtin_flag= - -if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag=' -fno-builtin' - - -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$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 "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:5827: \$? = $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 - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $rm conftest* - -fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 - -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions" -else - : -fi - -fi - -lt_prog_compiler_wl= -lt_prog_compiler_pic= -lt_prog_compiler_static= - -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_static='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - fi - ;; - - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic='-fno-common' - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic=-Kconform_pic - fi - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - ;; - - *) - lt_prog_compiler_pic='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static='-Bstatic' - else - lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static='-non_shared' - ;; - - newsos6) - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - linux*) - case $CC in - icc* | ecc*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-static' - ;; - ccc*) - lt_prog_compiler_wl='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static='-non_shared' - ;; - esac - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl='-Wl,' - # All OSF/1 code is PIC. - 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' - ;; - - sunos4*) - lt_prog_compiler_wl='-Qoption ld ' - lt_prog_compiler_pic='-PIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - lt_prog_compiler_wl='-Wl,' - lt_prog_compiler_pic='-KPIC' - lt_prog_compiler_static='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic='-Kconform_pic' - lt_prog_compiler_static='-Bstatic' - fi - ;; - - uts4*) - lt_prog_compiler_pic='-pic' - lt_prog_compiler_static='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared=no - ;; - esac - fi - -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic" >&6 - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic"; then - -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6 -if test "${lt_prog_compiler_pic_works+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_pic_works=no - ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$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 "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:6060: \$? = $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 - lt_prog_compiler_pic_works=yes - fi - fi - $rm conftest* - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6 - -if test x"$lt_prog_compiler_pic_works" = xyes; then - case $lt_prog_compiler_pic in - "" | " "*) ;; - *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;; - esac -else - lt_prog_compiler_pic= - lt_prog_compiler_can_build_shared=no -fi - -fi -case "$host_os" in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic= - ;; - *) - lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC" - ;; -esac - -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 -if test "${lt_cv_prog_compiler_c_o+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$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 "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:6120: \$? = $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 - lt_cv_prog_compiler_c_o=yes - fi - fi - chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* - -fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6 - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 - - runpath_var= - allow_undefined_flag= - enable_shared_with_static_runtimes=no - archive_cmds= - archive_expsym_cmds= - old_archive_From_new_cmds= - old_archive_from_expsyms_cmds= - export_dynamic_flag_spec= - whole_archive_flag_spec= - thread_safe_flag_spec= - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= - hardcode_libdir_separator= - hardcode_direct=no - hardcode_minus_L=no - hardcode_shlibpath_var=unsupported - link_all_deplibs=unknown - hardcode_automatic=no - module_cmds= - module_expsym_cmds= - always_export_symbols=no - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms="_GLOBAL_OFFSET_TABLE_" - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - ld_shlibs=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec='-L$libdir' - allow_undefined_flag=unsupported - always_export_symbols=no - enable_shared_with_static_runtimes=yes - export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /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' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - else - ld_shlibs=no - fi - ;; - - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris* | sysv5*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs=no - cat <&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - - sunos4*) - archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct=yes - 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' - archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs=no - fi - ;; - esac - - if test "$ld_shlibs" = 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 - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag=unsupported - always_export_symbols=yes - archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct=unsupported - fi - ;; - - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds='' - hardcode_direct=yes - hardcode_libdir_separator=':' - link_all_deplibs=yes - - if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct=yes - else - # We have old collect2 - hardcode_direct=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L=yes - hardcode_libdir_flag_spec='-L$libdir' - hardcode_libdir_separator= - fi - esac - shared_flag='-shared' - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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 - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec='${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" - 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" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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 - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag=' ${wl}-bernotok' - allow_undefined_flag=' ${wl}-berok' - # -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=' ' - 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' - fi - fi - ;; - - amigaos*) - archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - # see comment about different semantics on the GNU ld section - ld_shlibs=no - ;; - - bsdi4*) - export_dynamic_flag_spec=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec=' ' - allow_undefined_flag=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`cygpath -w "$srcfile"`' - enable_shared_with_static_runtimes=yes - ;; - - darwin* | rhapsody*) - 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 - ;; - 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}' - 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 - ;; - - dgux*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - freebsd1*) - ld_shlibs=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | 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 - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_direct=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - export_dynamic_flag_spec='${wl}-E' - ;; - - hpux10* | hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds='$CC -shared ${wl}+h ${wl}$soname -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' - ;; - *) - archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_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_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' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld='-rpath $libdir' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - link_all_deplibs=yes - ;; - - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_direct=yes - hardcode_shlibpath_var=no - ;; - - newsos6) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - hardcode_shlibpath_var=no - ;; - - openbsd*) - hardcode_direct=yes - hardcode_shlibpath_var=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - export_dynamic_flag_spec='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac - fi - ;; - - os2*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_minus_L=yes - allow_undefined_flag=unsupported - archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag=' -expect_unresolved \*' - archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec='-rpath $libdir' - fi - hardcode_libdir_separator=: - ;; - - 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 - 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 - archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - hardcode_libdir_flag_spec='-R$libdir' - hardcode_shlibpath_var=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;; - esac - link_all_deplibs=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=yes - hardcode_minus_L=yes - hardcode_shlibpath_var=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds='$CC -r -o $output$reload_objs' - hardcode_direct=no - ;; - motorola) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var=no - ;; - - sysv4.3*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - export_dynamic_flag_spec='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs=yes - fi - ;; - - sysv4.2uw2*) - archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct=yes - hardcode_minus_L=no - hardcode_shlibpath_var=no - hardcode_runpath_var=yes - 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' - else - archive_cmds='$CC -G ${wl}-h ${wl}$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= - hardcode_shlibpath_var=no - runpath_var='LD_RUN_PATH' - ;; - - uts4*) - archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec='-L$libdir' - hardcode_shlibpath_var=no - ;; - - *) - ld_shlibs=no - ;; - esac - fi - -echo "$as_me:$LINENO: result: $ld_shlibs" >&5 -echo "${ECHO_T}$ld_shlibs" >&6 -test "$ld_shlibs" = no && can_build_shared=no - -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? -# -case "x$archive_cmds_need_lc" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 - $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc=no - else - archive_cmds_need_lc=yes - fi - allow_undefined_flag=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5 -echo "${ECHO_T}$archive_cmds_need_lc" >&6 - ;; - esac - fi - ;; -esac - -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - 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 ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - 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 -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix4* | aix5*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -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= -if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var " || \ - test "X$hardcode_automatic"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no && - test "$hardcode_minus_L" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action" >&5 -echo "${ECHO_T}$hardcode_action" >&6 - -if test "$hardcode_action" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -striplib= -old_striplib= -echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5 -echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6 -if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP" ; then - striplib="$STRIP -x" - 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 declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any 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 declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any 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 - -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. */ - -/* 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 - -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 - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - 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* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 - - if test "x$lt_cv_dlopen_self" = xyes; then - 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 < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - 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* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - -# Report which librarie types wil actually be built -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 - -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case "$host_os" in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; - -aix4* | aix5*) - 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 -echo "${ECHO_T}$enable_shared" >&6 - -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler \ - CC \ - LD \ - lt_prog_compiler_wl \ - lt_prog_compiler_pic \ - lt_prog_compiler_static \ - lt_prog_compiler_no_builtin_flag \ - export_dynamic_flag_spec \ - thread_safe_flag_spec \ - whole_archive_flag_spec \ - enable_shared_with_static_runtimes \ - old_archive_cmds \ - old_archive_from_new_cmds \ - predep_objects \ - postdep_objects \ - predeps \ - postdeps \ - compiler_lib_search_path \ - archive_cmds \ - archive_expsym_cmds \ - postinstall_cmds \ - postuninstall_cmds \ - old_archive_from_expsyms_cmds \ - allow_undefined_flag \ - no_undefined_flag \ - export_symbols_cmds \ - hardcode_libdir_flag_spec \ - hardcode_libdir_flag_spec_ld \ - hardcode_libdir_separator \ - hardcode_automatic \ - module_cmds \ - module_expsym_cmds \ - lt_cv_prog_compiler_c_o \ - exclude_expsyms \ - include_expsyms; do - - case $var in - old_archive_cmds | \ - old_archive_from_new_cmds | \ - archive_cmds | \ - archive_expsym_cmds | \ - module_cmds | \ - module_expsym_cmds | \ - old_archive_from_expsyms_cmds | \ - export_symbols_cmds | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="${ofile}T" - trap "$rm \"$cfgfile\"; exit 1" 1 2 15 - $rm -f "$cfgfile" - { echo "$as_me:$LINENO: creating $ofile" >&5 -echo "$as_me: creating $ofile" >&6;} - - cat <<__EOF__ >> "$cfgfile" -#! $SHELL - -# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP) -# NOTE: Changes made to this file will be lost: look at ltmain.sh. -# -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 -# Free Software Foundation, Inc. -# -# This file is part of GNU Libtool: -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -# A sed program that does not truncate output. -SED=$lt_SED - -# Sed that helps us avoid accidentally triggering echo(1) options like -n. -Xsed="$SED -e s/^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 - -# The names of the tagged configurations supported by this script. -available_tags= - -# ### BEGIN LIBTOOL CONFIG - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# A language-specific compiler. -CC=$lt_compiler - -# Is the compiler the GNU C compiler? -with_gcc=$GCC - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o - -# Must we lock files when doing compilation ? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds -archive_expsym_cmds=$lt_archive_expsym_cmds -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds -module_expsym_cmds=$lt_module_expsym_cmds - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path" - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms - -# ### END LIBTOOL CONFIG - -__EOF__ - - - case $host_os in - aix3*) - cat <<\EOF >> "$cfgfile" - -# AIX sometimes has problems with the GCC collect2 program. For some -# reason, if we set the COLLECT_NAMES environment variable, the problems -# vanish in a puff of smoke. -if test "X${COLLECT_NAMES+set}" != Xset; then - COLLECT_NAMES= - export COLLECT_NAMES -fi -EOF - ;; - esac - - # We use sed instead of cat because bash on DJGPP gets confused if - # if finds mixed CR/LF and LF-only lines. Since sed operates in - # text mode, it properly converts lines to CR/LF. This bash problem - # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1) - - mv -f "$cfgfile" "$ofile" || \ - (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") - chmod +x "$ofile" - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - -# Check whether --with-tags or --without-tags was given. -if test "${with_tags+set}" = set; then - withval="$with_tags" - tagnames="$withval" -fi; - -if test -f "$ltmain" && test -n "$tagnames"; then - if test ! -f "${ofile}"; then - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5 -echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;} - fi - - if test -z "$LTCC"; then - eval "`$SHELL ${ofile} --config | grep '^LTCC='`" - if test -z "$LTCC"; then - { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5 -echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;} - else - { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5 -echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;} - fi - fi - - # Extract list of available tagged configurations in $ofile. - # Note that this assumes the entire list is on one line. - available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'` - - lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," - for tagname in $tagnames; do - IFS="$lt_save_ifs" - # Check whether tagname contains only valid characters - case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in - "") ;; - *) { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5 -echo "$as_me: error: invalid tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null - then - { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5 -echo "$as_me: error: tag name \"$tagname\" already exists" >&2;} - { (exit 1); exit 1; }; } - fi - - # Update the list of available tags. - if test -n "$tagname"; then - echo appending configuration tag \"$tagname\" to $ofile - - case $tagname in - CXX) - if test -n "$CXX" && test "X$CXX" != "Xno"; 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' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - - - -archive_cmds_need_lc_CXX=no -allow_undefined_flag_CXX= -always_export_symbols_CXX=no -archive_expsym_cmds_CXX= -export_dynamic_flag_spec_CXX= -hardcode_direct_CXX=no -hardcode_libdir_flag_spec_CXX= -hardcode_libdir_flag_spec_ld_CXX= -hardcode_libdir_separator_CXX= -hardcode_minus_L_CXX=no -hardcode_automatic_CXX=no -module_cmds_CXX= -module_expsym_cmds_CXX= -link_all_deplibs_CXX=unknown -old_archive_cmds_CXX=$old_archive_cmds -no_undefined_flag_CXX= -whole_archive_flag_spec_CXX= -enable_shared_with_static_runtimes_CXX=no - -# Dependencies to place before and after the object being linked: -predep_objects_CXX= -postdep_objects_CXX= -predeps_CXX= -postdeps_CXX= -compiler_lib_search_path_CXX= - -# Source file extension for C++ test sources. -ac_ext=cc - -# Object file extension for compiled C++ test sources. -objext=o -objext_CXX=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code="int some_variable = 0;\n" - -# Code to be used in simple link tests -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"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# Allow CC to be a program name with arguments. -lt_save_CC=$CC -lt_save_LD=$LD -lt_save_GCC=$GCC -GCC=$GXX -lt_save_with_gnu_ld=$with_gnu_ld -lt_save_path_LD=$lt_cv_path_LD -if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then - lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -else - 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 -fi -test -z "${LDCXX+set}" || LD=$LDCXX -CC=${CXX-"c++"} -compiler=$CC -compiler_CXX=$CC -cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'` - -# We don't want -fno-exception wen compiling C++ code, so set the -# no_builtin_flag separately -if test "$GXX" = yes; then - lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin' -else - lt_prog_compiler_no_builtin_flag_CXX= -fi - -if test "$GXX" = yes; then - # Set up default GNU C++ configuration - - -# Check whether --with-gnu-ld or --without-gnu-ld was given. -if test "${with_gnu_ld+set}" = set; then - withval="$with_gnu_ld" - test "$withval" = no || with_gnu_ld=yes -else - with_gnu_ld=no -fi; -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo "$as_me:$LINENO: checking for ld used by $CC" >&5 -echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [\\/]* | ?:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' - # Canonicalize the pathname of ld - ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - echo "$as_me:$LINENO: checking for GNU ld" >&5 -echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6 -else - echo "$as_me:$LINENO: checking for non-GNU ld" >&5 -echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6 -fi -if test "${lt_cv_path_LD+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -z "$LD"; then - lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR - for ac_dir in $PATH; do - IFS="$lt_save_ifs" - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - lt_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - case `"$lt_cv_path_LD" -v 2>&1 &5 -echo "${ECHO_T}$LD" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi -test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5 -echo "$as_me: error: no acceptable ld found in \$PATH" >&2;} - { (exit 1); exit 1; }; } -echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5 -echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6 -if test "${lt_cv_prog_gnu_ld+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # I'd rather use --version here, but apparently some GNU ld's only accept -v. -case `$LD -v 2>&1 &5 -echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6 -with_gnu_ld=$lt_cv_prog_gnu_ld - - - - # Check if GNU C++ uses GNU ld as the underlying linker, since the - # archiving commands below assume that GNU ld is being used. - if test "$with_gnu_ld" = yes; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # If archive_cmds runs LD, not CC, wlarc should be empty - # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to - # investigate it a little bit more. (MM) - wlarc='${wl}' - - # ancient GNU ld didn't support --whole-archive et. al. - if eval "`$CC -print-prog-name=ld` --help 2>&1" | \ - grep 'no-whole-archive' > /dev/null; then - whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' - else - whole_archive_flag_spec_CXX= - fi - else - with_gnu_ld=no - wlarc= - - # A generic and very simple default shared library creation - # command for GNU C++ for the case where it uses the native - # linker, instead of GNU ld. If possible, this setting should - # overridden to take advantage of the native linker features on - # the platform it is being used on. - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' - fi - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - -else - GXX=no - with_gnu_ld=no - wlarc= -fi - -# PORTME: fill in a description of your system's C++ link characteristics -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 -ld_shlibs_CXX=yes -case $host_os in - aix3*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - case $ld_flag in - *-brtl*) - aix_use_runtimelinking=yes - break - ;; - esac - done - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_CXX='' - hardcode_direct_CXX=yes - hardcode_libdir_separator_CXX=':' - link_all_deplibs_CXX=yes - - if test "$GXX" = yes; then - case $host_os in aix4.012|aix4.012.*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct_CXX=yes - else - # We have old collect2 - hardcode_direct_CXX=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_CXX=yes - hardcode_libdir_flag_spec_CXX='-L$libdir' - hardcode_libdir_separator_CXX= - fi - esac - shared_flag='-shared' - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_CXX=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_CXX='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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 - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_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" - 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" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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 - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_CXX=' ${wl}-bernotok' - allow_undefined_flag_CXX=' ${wl}-berok' - # -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=' ' - 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' - fi - fi - ;; - chorus*) - case $cc_basename in - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_CXX='-L$libdir' - allow_undefined_flag_CXX=unsupported - always_export_symbols_CXX=no - enable_shared_with_static_runtimes_CXX=yes - - if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$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' - ;; - 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' - - # 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 - ;; - - dgux*) - case $cc_basename in - ec++) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - ghcx) - # Green Hills C++ Compiler - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - freebsd12*) - # 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 3 and later use GNU C++ and GNU ld with standard ELF - # conventions - ld_shlibs_CXX=yes - ;; - gnu*) - ;; - hpux9*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_CXX=: - export_dynamic_flag_spec_CXX='${wl}-E' - hardcode_direct_CXX=yes - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC) - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - hpux10*|hpux11*) - if test $with_gnu_ld = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir' - 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*) - 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 - hardcode_minus_L_CXX=yes # Not in the search PATH, - # but as the default - # location of the library. - ;; - esac - - case $cc_basename in - CC) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - aCC) - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' - ;; - *) - archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes; then - if test $with_gnu_ld = no; then - case "$host_cpu" in - ia64*|hppa*64*) - archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs' - ;; - *) - archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' - ;; - esac - fi - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - irix5* | irix6*) - case $cc_basename in - CC) - # SGI C++ - archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - - # Archives containing C++ object files must be created using - # "CC -ar", where "CC" is the IRIX C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs' - ;; - *) - if test "$GXX" = yes; then - if test "$with_gnu_ld" = no; then - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - else - archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib' - fi - fi - link_all_deplibs_CXX=yes - ;; - esac - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - ;; - linux*) - case $cc_basename in - KCC) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - - hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' - export_dynamic_flag_spec_CXX='${wl}--export-dynamic' - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - ;; - icpc) - # Intel C++ - with_gnu_ld=yes - 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) - # Compaq C++ - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' - - runpath_var=LD_RUN_PATH - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - esac - ;; - lynxos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - m88k*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - mvs*) - case $cc_basename in - cxx) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_CXX='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' - wlarc= - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_direct_CXX=yes - hardcode_shlibpath_var_CXX=no - fi - # Workaround some broken pre-1.5 toolchains - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' - ;; - osf3*) - case $cc_basename in - KCC) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # "CC -Bstatic", where "CC" is the KAI C++ compiler. - old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs' - - ;; - RCC) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx) - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - osf4* | osf5*) - case $cc_basename in - KCC) - # Kuck and Associates, Inc. (KAI) C++ Compiler - - # KCC will only create a shared library if the output file - # ends with ".so" (or ".sl" for HP-UX), so rename the library - # to its proper name (with version) after linking. - archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir' - hardcode_libdir_separator_CXX=: - - # Archives containing C++ object files must be created using - # the KAI C++ compiler. - old_archive_cmds_CXX='$CC -o $oldlib $oldobjs' - ;; - RCC) - # Rational C++ 2.4.1 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - cxx) - allow_undefined_flag_CXX=' -expect_unresolved \*' - archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${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~ - $rm $lib.exp' - - hardcode_libdir_flag_spec_CXX='-rpath $libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - # - # There doesn't appear to be a way to prevent this compiler from - # explicitly linking system object files so we need to strip them - # from the output so that they don't get included in the library - # dependencies. - output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' - ;; - *) - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib' - - hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_CXX=: - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"' - - else - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - fi - ;; - esac - ;; - psos*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - 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) - # Sun C++ 4.x - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - lcc) - # Lucid - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - solaris*) - case $cc_basename in - CC) - # Sun C++ 4.2, 5.x and Centerline C++ - 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_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' - - hardcode_libdir_flag_spec_CXX='-R$libdir' - hardcode_shlibpath_var_CXX=no - case $host_os in - 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. - # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$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' - - # Archives containing C++ object files must be created using - # "CC -xar", where "CC" is the Sun C++ compiler. This is - # necessary to make sure instantiated templates are included - # in the archive. - old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs' - ;; - gcx) - # Green Hills C++ Compiler - archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - - # The C++ compiler must be used to create the archive. - old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs' - ;; - *) - # GNU C++ compiler with Solaris linker - if test "$GXX" = yes && test "$with_gnu_ld" = no; then - no_undefined_flag_CXX=' ${wl}-z ${wl}defs' - if $CC --version | grep -v '^2\.7' > /dev/null; then - archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - else - # g++ 2.7 appears to require `-G' NOT `-shared' on this - # platform. - archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' - archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp' - - # Commands to make compiler produce verbose output that lists - # what "hidden" libraries, object files and flags are used when - # linking a shared library. - output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\"" - fi - - hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir' - fi - ;; - esac - ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - archive_cmds_need_lc_CXX=no - ;; - tandem*) - case $cc_basename in - NCC) - # NonStop-UX NCC 3.20 - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - esac - ;; - vxworks*) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; - *) - # FIXME: insert proper C++ library support - ld_shlibs_CXX=no - ;; -esac -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 -test "$ld_shlibs_CXX" = no && can_build_shared=no - -GCC_CXX="$GXX" -LD_CXX="$LD" - - -cat > conftest.$ac_ext <&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - - # Sentinel used to keep track of whether or not we are before - # the conftest object file. - pre_test_object_deps_done=no - - # The `*' in the case matches for architectures that use `case' in - # $output_verbose_cmd can trigger glob expansion during the loop - # eval without this substitution. - output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`" - - for p in `eval $output_verbose_link_cmd`; do - case $p in - - -L* | -R* | -l*) - # Some compilers place space between "-{L,R}" and the path. - # Remove the space. - if test $p = "-L" \ - || test $p = "-R"; then - prev=$p - continue - else - prev= - fi - - if test "$pre_test_object_deps_done" = no; then - case $p in - -L* | -R*) - # Internal compiler library paths should come after those - # provided the user. The postdeps already come after the - # user supplied libs so there is no need to process them. - if test -z "$compiler_lib_search_path_CXX"; then - compiler_lib_search_path_CXX="${prev}${p}" - else - compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}" - fi - ;; - # The "-l" case would never come before the object being - # linked, so don't bother handling this case. - esac - else - if test -z "$postdeps_CXX"; then - postdeps_CXX="${prev}${p}" - else - postdeps_CXX="${postdeps_CXX} ${prev}${p}" - fi - fi - ;; - - *.$objext) - # This assumes that the test object file only shows up - # once in the compiler output. - if test "$p" = "conftest.$objext"; then - pre_test_object_deps_done=yes - continue - fi - - if test "$pre_test_object_deps_done" = no; then - if test -z "$predep_objects_CXX"; then - predep_objects_CXX="$p" - else - predep_objects_CXX="$predep_objects_CXX $p" - fi - else - if test -z "$postdep_objects_CXX"; then - postdep_objects_CXX="$p" - else - postdep_objects_CXX="$postdep_objects_CXX $p" - fi - fi - ;; - - *) ;; # Ignore the rest. - - esac - done - - # Clean up. - rm -f a.out a.exe -else - echo "libtool.m4: error: problem compiling CXX test program" -fi - -$rm -f confest.$objext - -case " $postdeps_CXX " in -*" -lc "*) archive_cmds_need_lc_CXX=no ;; -esac - -lt_prog_compiler_wl_CXX= -lt_prog_compiler_pic_CXX= -lt_prog_compiler_static_CXX= - -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - fi - ;; - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4' - ;; - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - mingw* | os2* | pw32*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_CXX='-DDLL_EXPORT' - ;; - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_CXX='-fno-common' - ;; - *djgpp*) - # DJGPP does not support shared libraries at all - lt_prog_compiler_pic_CXX= - ;; - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_CXX=-Kconform_pic - fi - ;; - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - ;; - *) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - esac - else - case $host_os in - aix4* | aix5*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_CXX='-Bstatic' - else - lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp' - fi - ;; - chorus*) - case $cc_basename in - cxch68) - # Green Hills C++ Compiler - # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" - ;; - esac - ;; - dgux*) - case $cc_basename in - ec++) - lt_prog_compiler_pic_CXX='-KPIC' - ;; - ghcx) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - freebsd* | kfreebsd*-gnu) - # FreeBSD uses GNU C++ - ;; - hpux9* | hpux10* | hpux11*) - case $cc_basename in - CC) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - if test "$host_cpu" != ia64; then - lt_prog_compiler_pic_CXX='+Z' - fi - ;; - aCC) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive" - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_CXX='+Z' - ;; - esac - ;; - *) - ;; - esac - ;; - irix5* | irix6* | nonstopux*) - case $cc_basename in - CC) - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_static_CXX='-non_shared' - # CC pic flag -KPIC is the default. - ;; - *) - ;; - esac - ;; - linux*) - case $cc_basename in - KCC) - # KAI C++ Compiler - lt_prog_compiler_wl_CXX='--backend -Wl,' - lt_prog_compiler_pic_CXX='-fPIC' - ;; - icpc) - # Intel C++ - lt_prog_compiler_wl_CXX='-Wl,' - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-static' - ;; - cxx) - # Compaq C++ - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - lynxos*) - ;; - m88k*) - ;; - mvs*) - case $cc_basename in - cxx) - lt_prog_compiler_pic_CXX='-W c,exportall' - ;; - *) - ;; - esac - ;; - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - ;; - osf3* | osf4* | osf5*) - case $cc_basename in - KCC) - lt_prog_compiler_wl_CXX='--backend -Wl,' - ;; - RCC) - # Rational C++ 2.4.1 - lt_prog_compiler_pic_CXX='-pic' - ;; - cxx) - # Digital/Compaq C++ - lt_prog_compiler_wl_CXX='-Wl,' - # Make sure the PIC flag is empty. It appears that all Alpha - # Linux and Compaq Tru64 Unix objects are PIC. - lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX='-non_shared' - ;; - *) - ;; - esac - ;; - psos*) - ;; - sco*) - case $cc_basename in - CC) - lt_prog_compiler_pic_CXX='-fPIC' - ;; - *) - ;; - esac - ;; - solaris*) - case $cc_basename in - CC) - # Sun C++ 4.2, 5.x and Centerline C++ - lt_prog_compiler_pic_CXX='-KPIC' - lt_prog_compiler_static_CXX='-Bstatic' - lt_prog_compiler_wl_CXX='-Qoption ld ' - ;; - gcx) - # Green Hills C++ Compiler - lt_prog_compiler_pic_CXX='-PIC' - ;; - *) - ;; - esac - ;; - sunos4*) - case $cc_basename in - CC) - # Sun C++ 4.x - lt_prog_compiler_pic_CXX='-pic' - lt_prog_compiler_static_CXX='-Bstatic' - ;; - lcc) - # Lucid - lt_prog_compiler_pic_CXX='-pic' - ;; - *) - ;; - esac - ;; - tandem*) - case $cc_basename in - NCC) - # NonStop-UX NCC 3.20 - lt_prog_compiler_pic_CXX='-KPIC' - ;; - *) - ;; - esac - ;; - unixware*) - ;; - vxworks*) - ;; - *) - lt_prog_compiler_can_build_shared_CXX=no - ;; - esac - fi - -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6 - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_CXX"; then - -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6 -if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_pic_works_CXX=no - ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$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 "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:10583: \$? = $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 - lt_prog_compiler_pic_works_CXX=yes - fi - fi - $rm conftest* - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6 - -if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then - case $lt_prog_compiler_pic_CXX in - "" | " "*) ;; - *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;; - esac -else - lt_prog_compiler_pic_CXX= - lt_prog_compiler_can_build_shared_CXX=no -fi - -fi -case "$host_os" in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_CXX= - ;; - *) - lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC" - ;; -esac - -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 -if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o_CXX=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$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 "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:10643: \$? = $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 - lt_cv_prog_compiler_c_o_CXX=yes - fi - fi - chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* - -fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6 - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in - aix4* | aix5*) - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - ;; - pw32*) - export_symbols_cmds_CXX="$ltdll_cmds" - ;; - cygwin* | mingw*) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols' - ;; - linux*) - link_all_deplibs_CXX=no - ;; - *) - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - ;; - esac - -echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5 -echo "${ECHO_T}$ld_shlibs_CXX" >&6 -test "$ld_shlibs_CXX" = no && can_build_shared=no - -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? -# -case "x$archive_cmds_need_lc_CXX" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_CXX=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_CXX in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 - $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_CXX - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_CXX=no - else - archive_cmds_need_lc_CXX=yes - fi - allow_undefined_flag_CXX=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6 - ;; - esac - fi - ;; -esac - -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - 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 -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix4* | aix5*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -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_CXX= -if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var CXX" || \ - test "X$hardcode_automatic_CXX"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_CXX" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no && - test "$hardcode_minus_L_CXX" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_CXX=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_CXX=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_CXX=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5 -echo "${ECHO_T}$hardcode_action_CXX" >&6 - -if test "$hardcode_action_CXX" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -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_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 - -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 declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any 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_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 - -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_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 - -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 declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any 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_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 - -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_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 - -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_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 - -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. */ - -/* 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 - -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 - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - 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* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 - - if test "x$lt_cv_dlopen_self" = xyes; then - 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 < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - 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* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - -# 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 - - case $var in - old_archive_cmds_CXX | \ - old_archive_from_new_cmds_CXX | \ - archive_cmds_CXX | \ - archive_expsym_cmds_CXX | \ - module_cmds_CXX | \ - module_expsym_cmds_CXX | \ - old_archive_from_expsyms_cmds_CXX | \ - export_symbols_cmds_CXX | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_CXX - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# A language-specific compiler. -CC=$lt_compiler_CXX - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_CXX - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_CXX - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_CXX - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_CXX -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX - -# Must we lock files when doing compilation ? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_CXX - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_CXX -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_CXX -archive_expsym_cmds=$lt_archive_expsym_cmds_CXX -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_CXX -module_expsym_cmds=$lt_module_expsym_cmds_CXX - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_CXX - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_CXX - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_CXX - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_CXX - -# The 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__ - - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC=$lt_save_CC -LDCXX=$LD -LD=$lt_save_LD -GCC=$lt_save_GCC -with_gnu_ldcxx=$with_gnu_ld -with_gnu_ld=$lt_save_with_gnu_ld -lt_cv_path_LDCXX=$lt_cv_path_LD -lt_cv_path_LD=$lt_save_path_LD -lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld - - else - tagname="" - fi - ;; - - F77) - if test -n "$F77" && test "X$F77" != "Xno"; then - -ac_ext=f -ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5' -ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_f77_compiler_gnu - - -archive_cmds_need_lc_F77=no -allow_undefined_flag_F77= -always_export_symbols_F77=no -archive_expsym_cmds_F77= -export_dynamic_flag_spec_F77= -hardcode_direct_F77=no -hardcode_libdir_flag_spec_F77= -hardcode_libdir_flag_spec_ld_F77= -hardcode_libdir_separator_F77= -hardcode_minus_L_F77=no -hardcode_automatic_F77=no -module_cmds_F77= -module_expsym_cmds_F77= -link_all_deplibs_F77=unknown -old_archive_cmds_F77=$old_archive_cmds -no_undefined_flag_F77= -whole_archive_flag_spec_F77= -enable_shared_with_static_runtimes_F77=no - -# Source file extension for f77 test sources. -ac_ext=f - -# Object file extension for compiled f77 test sources. -objext=o -objext_F77=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code=" subroutine t\n return\n end\n" - -# Code to be used in simple link tests -lt_simple_link_test_code=" program t\n end\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"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# 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%^.*/%%'` - -echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5 -echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6 -echo "$as_me:$LINENO: result: $can_build_shared" >&5 -echo "${ECHO_T}$can_build_shared" >&6 - -echo "$as_me:$LINENO: checking whether to build shared libraries" >&5 -echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6 -test "$can_build_shared" = "no" && enable_shared=no - -# On AIX, shared libraries and static libraries use the same namespace, and -# are all built from PIC. -case "$host_os" in -aix3*) - test "$enable_shared" = yes && enable_static=no - if test -n "$RANLIB"; then - archive_cmds="$archive_cmds~\$RANLIB \$lib" - postinstall_cmds='$RANLIB $lib' - fi - ;; -aix4* | aix5*) - test "$enable_shared" = yes && enable_static=no - ;; -esac -echo "$as_me:$LINENO: result: $enable_shared" >&5 -echo "${ECHO_T}$enable_shared" >&6 - -echo "$as_me:$LINENO: checking whether to build static libraries" >&5 -echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6 -# Make sure either enable_shared or enable_static is yes. -test "$enable_shared" = yes || enable_static=yes -echo "$as_me:$LINENO: result: $enable_static" >&5 -echo "${ECHO_T}$enable_static" >&6 - -test "$ld_shlibs_F77" = no && can_build_shared=no - -GCC_F77="$G77" -LD_F77="$LD" - -lt_prog_compiler_wl_F77= -lt_prog_compiler_pic_F77= -lt_prog_compiler_static_F77= - -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 - - if test "$GCC" = yes; then - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_static_F77='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_F77='-Bstatic' - fi - ;; - - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_F77='-fno-common' - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared_F77=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_F77=-Kconform_pic - fi - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; - esac - ;; - - *) - lt_prog_compiler_pic_F77='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl_F77='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_F77='-Bstatic' - else - lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_F77='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - lt_prog_compiler_wl_F77='-Wl,' - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_F77='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static_F77='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl_F77='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static_F77='-non_shared' - ;; - - newsos6) - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - linux*) - case $CC in - icc* | ecc*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-static' - ;; - ccc*) - lt_prog_compiler_wl_F77='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_F77='-non_shared' - ;; - esac - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl_F77='-Wl,' - # All OSF/1 code is PIC. - 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' - ;; - - sunos4*) - lt_prog_compiler_wl_F77='-Qoption ld ' - lt_prog_compiler_pic_F77='-PIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - lt_prog_compiler_wl_F77='-Wl,' - lt_prog_compiler_pic_F77='-KPIC' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic_F77='-Kconform_pic' - lt_prog_compiler_static_F77='-Bstatic' - fi - ;; - - uts4*) - lt_prog_compiler_pic_F77='-pic' - lt_prog_compiler_static_F77='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared_F77=no - ;; - esac - fi - -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6 - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_F77"; then - -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6 -if test "${lt_prog_compiler_pic_works_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_pic_works_F77=no - ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_F77" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$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 "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:12937: \$? = $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 - lt_prog_compiler_pic_works_F77=yes - fi - fi - $rm conftest* - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6 - -if test x"$lt_prog_compiler_pic_works_F77" = xyes; then - case $lt_prog_compiler_pic_F77 in - "" | " "*) ;; - *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;; - esac -else - lt_prog_compiler_pic_F77= - lt_prog_compiler_can_build_shared_F77=no -fi - -fi -case "$host_os" in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_F77= - ;; - *) - lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77" - ;; -esac - -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 -if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o_F77=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$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 "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:12997: \$? = $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 - lt_cv_prog_compiler_c_o_F77=yes - fi - fi - chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* - -fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6 - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 - - runpath_var= - allow_undefined_flag_F77= - enable_shared_with_static_runtimes_F77=no - archive_cmds_F77= - archive_expsym_cmds_F77= - old_archive_From_new_cmds_F77= - old_archive_from_expsyms_cmds_F77= - export_dynamic_flag_spec_F77= - whole_archive_flag_spec_F77= - thread_safe_flag_spec_F77= - hardcode_libdir_flag_spec_F77= - hardcode_libdir_flag_spec_ld_F77= - hardcode_libdir_separator_F77= - hardcode_direct_F77=no - hardcode_minus_L_F77=no - hardcode_shlibpath_var_F77=unsupported - link_all_deplibs_F77=unknown - hardcode_automatic_F77=no - module_cmds_F77= - module_expsym_cmds_F77= - always_export_symbols_F77=no - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms_F77= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_" - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - ld_shlibs_F77=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_F77=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_F77=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_F77=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_F77=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_F77='-L$libdir' - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=no - enable_shared_with_static_runtimes_F77=yes - export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /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' - # If the export-symbols file already is a .def file (1st line - # is EXPORTS), use it as is; otherwise, prepend... - archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - else - ld_shlibs=no - fi - ;; - - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris* | sysv5*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs_F77=no - cat <&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - - sunos4*) - archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - 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' - archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_F77=no - fi - ;; - esac - - if test "$ld_shlibs_F77" = 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 - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag_F77=unsupported - always_export_symbols_F77=yes - archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # Note: this linker hardcodes the directories in LIBPATH if there - # are no directories specified by -L. - hardcode_minus_L_F77=yes - if test "$GCC" = yes && test -z "$link_static_flag"; then - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct_F77=unsupported - fi - ;; - - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_F77='' - hardcode_direct_F77=yes - hardcode_libdir_separator_F77=':' - link_all_deplibs_F77=yes - - if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct_F77=yes - else - # We have old collect2 - hardcode_direct_F77=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_F77=yes - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_libdir_separator_F77= - fi - esac - shared_flag='-shared' - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_F77=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_F77='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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_f77_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 - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_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" - 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" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF - program main - - end -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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_f77_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 - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_F77=' ${wl}-bernotok' - allow_undefined_flag_F77=' ${wl}-berok' - # -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=' ' - 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' - fi - fi - ;; - - amigaos*) - archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - # see comment about different semantics on the GNU ld section - ld_shlibs_F77=no - ;; - - bsdi4*) - export_dynamic_flag_spec_F77=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_F77=' ' - allow_undefined_flag_F77=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - old_archive_From_new_cmds_F77='true' - # FIXME: Should let the user specify the lib program. - old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs' - fix_srcfile_path='`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 - ;; - 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}' - hardcode_direct_F77=no - hardcode_automatic_F77=yes - hardcode_shlibpath_var_F77=unsupported - whole_archive_flag_spec_F77='-all_load $convenience' - link_all_deplibs_F77=yes - else - ld_shlibs_F77=no - fi - ;; - - dgux*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_shlibpath_var_F77=no - ;; - - freebsd1*) - ld_shlibs_F77=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_minus_L_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | 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 - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_F77=: - hardcode_direct_F77=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - export_dynamic_flag_spec_F77='${wl}-E' - ;; - - hpux10* | hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -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' - ;; - *) - archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_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_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' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_F77=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld_F77='-rpath $libdir' - fi - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - link_all_deplibs_F77=yes - ;; - - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - newsos6) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - hardcode_shlibpath_var_F77=no - ;; - - openbsd*) - hardcode_direct_F77=yes - hardcode_shlibpath_var_F77=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - export_dynamic_flag_spec_F77='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-R$libdir' - ;; - *) - archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir' - ;; - esac - fi - ;; - - os2*) - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_minus_L_F77=yes - allow_undefined_flag_F77=unsupported - archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_F77=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag_F77=' -expect_unresolved \*' - archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_F77='-rpath $libdir' - fi - hardcode_libdir_separator_F77=: - ;; - - 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 - 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 - archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' - archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~ - $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp' - fi - hardcode_libdir_flag_spec_F77='-R$libdir' - hardcode_shlibpath_var_F77=no - case $host_os in - solaris2.[0-5] | solaris2.[0-5].*) ;; - *) # Supported since Solaris 2.6 (maybe 2.5.1?) - whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;; - esac - link_all_deplibs_F77=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_direct_F77=yes - hardcode_minus_L_F77=yes - hardcode_shlibpath_var_F77=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds_F77='$CC -r -o $output$reload_objs' - hardcode_direct_F77=no - ;; - motorola) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_F77=no - ;; - - sysv4.3*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - export_dynamic_flag_spec_F77='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_F77=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs_F77=yes - fi - ;; - - sysv4.2uw2*) - archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_F77=yes - hardcode_minus_L_F77=no - hardcode_shlibpath_var_F77=no - hardcode_runpath_var=yes - 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' - else - archive_cmds_F77='$CC -G ${wl}-h ${wl}$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= - hardcode_shlibpath_var_F77=no - runpath_var='LD_RUN_PATH' - ;; - - uts4*) - archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_F77='-L$libdir' - hardcode_shlibpath_var_F77=no - ;; - - *) - ld_shlibs_F77=no - ;; - esac - fi - -echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5 -echo "${ECHO_T}$ld_shlibs_F77" >&6 -test "$ld_shlibs_F77" = no && can_build_shared=no - -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? -# -case "x$archive_cmds_need_lc_F77" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_F77=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_F77 in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 - $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_F77 - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_F77 - allow_undefined_flag_F77= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_F77=no - else - archive_cmds_need_lc_F77=yes - fi - allow_undefined_flag_F77=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6 - ;; - esac - fi - ;; -esac - -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - 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 -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix4* | aix5*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -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_F77= -if test -n "$hardcode_libdir_flag_spec_F77" || \ - test -n "$runpath_var F77" || \ - test "X$hardcode_automatic_F77"="Xyes" ; then - - # We can hardcode non-existant directories. - if test "$hardcode_direct_F77" != no && - # If the only mechanism to avoid hardcoding is shlibpath_var, we - # have to relink, otherwise we might link with an installed library - # when we should be linking with a yet-to-be-installed one - ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no && - test "$hardcode_minus_L_F77" != no; then - # Linking always hardcodes the temporary library directory. - hardcode_action_F77=relink - else - # We can link without hardcoding, and we can hardcode nonexisting dirs. - hardcode_action_F77=immediate - fi -else - # We cannot hardcode anything, or else we can only hardcode existing - # directories. - hardcode_action_F77=unsupported -fi -echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5 -echo "${ECHO_T}$hardcode_action_F77" >&6 - -if test "$hardcode_action_F77" = relink; then - # Fast installation is not supported - enable_fast_install=no -elif test "$shlibpath_overrides_runpath" = yes || - test "$enable_shared" = no; then - # Fast installation is not necessary - enable_fast_install=needless -fi - -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 -# 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_F77 \ - CC_F77 \ - LD_F77 \ - lt_prog_compiler_wl_F77 \ - lt_prog_compiler_pic_F77 \ - lt_prog_compiler_static_F77 \ - lt_prog_compiler_no_builtin_flag_F77 \ - export_dynamic_flag_spec_F77 \ - thread_safe_flag_spec_F77 \ - whole_archive_flag_spec_F77 \ - enable_shared_with_static_runtimes_F77 \ - old_archive_cmds_F77 \ - old_archive_from_new_cmds_F77 \ - predep_objects_F77 \ - postdep_objects_F77 \ - predeps_F77 \ - postdeps_F77 \ - compiler_lib_search_path_F77 \ - archive_cmds_F77 \ - archive_expsym_cmds_F77 \ - postinstall_cmds_F77 \ - postuninstall_cmds_F77 \ - old_archive_from_expsyms_cmds_F77 \ - allow_undefined_flag_F77 \ - no_undefined_flag_F77 \ - export_symbols_cmds_F77 \ - hardcode_libdir_flag_spec_F77 \ - hardcode_libdir_flag_spec_ld_F77 \ - hardcode_libdir_separator_F77 \ - hardcode_automatic_F77 \ - module_cmds_F77 \ - module_expsym_cmds_F77 \ - lt_cv_prog_compiler_c_o_F77 \ - exclude_expsyms_F77 \ - include_expsyms_F77; do - - case $var in - old_archive_cmds_F77 | \ - old_archive_from_new_cmds_F77 | \ - archive_cmds_F77 | \ - archive_expsym_cmds_F77 | \ - module_cmds_F77 | \ - module_expsym_cmds_F77 | \ - old_archive_from_expsyms_cmds_F77 | \ - export_symbols_cmds_F77 | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_F77 - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77 - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# A language-specific compiler. -CC=$lt_compiler_F77 - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_F77 - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_F77 - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_F77 - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_F77 -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77 - -# Must we lock files when doing compilation ? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_F77 - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77 - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77 - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77 - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77 - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_F77 -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77 - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77 - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_F77 -archive_expsym_cmds=$lt_archive_expsym_cmds_F77 -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_F77 -module_expsym_cmds=$lt_module_expsym_cmds_F77 - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_F77 - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_F77 - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_F77 - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_F77 - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_F77 - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_F77 - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_F77 - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# 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_F77 - -# 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_F77 - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77 - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77 - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_F77 - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_F77 - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_F77 - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_F77 - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_F77 - -# 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_F77" - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_F77 - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_F77 - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_F77 - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_F77 - -# ### END LIBTOOL TAG CONFIG: $tagname - -__EOF__ - - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - else - tagname="" - fi - ;; - - GCJ) - if test -n "$GCJ" && test "X$GCJ" != "Xno"; then - - - -# Source file extension for Java test sources. -ac_ext=java - -# Object file extension for compiled Java test sources. -objext=o -objext_GCJ=$objext - -# Code to be used in simple compile tests -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' - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${GCJ-"gcj"} -compiler=$CC -compiler_GCJ=$CC - -# GCJ did not exist at the time GCC didn't implicitly link libc in. -archive_cmds_need_lc_GCJ=no - - -lt_prog_compiler_no_builtin_flag_GCJ= - -if test "$GCC" = yes; then - lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin' - - -echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6 -if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_rtti_exceptions=no - ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="-fno-rtti -fno-exceptions" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$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 "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:15042: \$? = $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 - lt_cv_prog_compiler_rtti_exceptions=yes - fi - fi - $rm conftest* - -fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6 - -if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then - lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions" -else - : -fi - -fi - -lt_prog_compiler_wl_GCJ= -lt_prog_compiler_pic_GCJ= -lt_prog_compiler_static_GCJ= - -echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5 -echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6 - - if test "$GCC" = yes; then - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_static_GCJ='-static' - - case $host_os in - aix*) - # All AIX code is PIC. - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_GCJ='-Bstatic' - fi - ;; - - amigaos*) - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4' - ;; - - beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) - # PIC is the default for these OSes. - ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' - ;; - - darwin* | rhapsody*) - # PIC is the default on this platform - # Common symbols not allowed in MH_DYLIB files - lt_prog_compiler_pic_GCJ='-fno-common' - ;; - - msdosdjgpp*) - # Just because we use GCC doesn't mean we suddenly get shared libraries - # on systems that don't support them. - lt_prog_compiler_can_build_shared_GCJ=no - enable_shared=no - ;; - - sysv4*MP*) - if test -d /usr/nec; then - lt_prog_compiler_pic_GCJ=-Kconform_pic - fi - ;; - - hpux*) - # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but - # not for PA HP-UX. - case "$host_cpu" in - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_GCJ='-fPIC' - ;; - esac - ;; - - *) - lt_prog_compiler_pic_GCJ='-fPIC' - ;; - esac - else - # PORTME Check for flag to pass linker flags through the system compiler. - case $host_os in - aix*) - lt_prog_compiler_wl_GCJ='-Wl,' - if test "$host_cpu" = ia64; then - # AIX 5 now supports IA64 processor - lt_prog_compiler_static_GCJ='-Bstatic' - else - lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp' - fi - ;; - - mingw* | pw32* | os2*) - # This hack is so that the source file can tell whether it is being - # built for inclusion in a dll (and should export symbols for example). - lt_prog_compiler_pic_GCJ='-DDLL_EXPORT' - ;; - - hpux9* | hpux10* | hpux11*) - 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 - hppa*64*|ia64*) - # +Z the default - ;; - *) - lt_prog_compiler_pic_GCJ='+Z' - ;; - esac - # Is there a better lt_prog_compiler_static that works with the bundled CC? - lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive' - ;; - - irix5* | irix6* | nonstopux*) - lt_prog_compiler_wl_GCJ='-Wl,' - # PIC (with -KPIC) is the default. - lt_prog_compiler_static_GCJ='-non_shared' - ;; - - newsos6) - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - linux*) - case $CC in - icc* | ecc*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-static' - ;; - ccc*) - lt_prog_compiler_wl_GCJ='-Wl,' - # All Alpha code is PIC. - lt_prog_compiler_static_GCJ='-non_shared' - ;; - esac - ;; - - osf3* | osf4* | osf5*) - lt_prog_compiler_wl_GCJ='-Wl,' - # All OSF/1 code is PIC. - 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' - ;; - - sunos4*) - lt_prog_compiler_wl_GCJ='-Qoption ld ' - lt_prog_compiler_pic_GCJ='-PIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) - lt_prog_compiler_wl_GCJ='-Wl,' - lt_prog_compiler_pic_GCJ='-KPIC' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - sysv4*MP*) - if test -d /usr/nec ;then - lt_prog_compiler_pic_GCJ='-Kconform_pic' - lt_prog_compiler_static_GCJ='-Bstatic' - fi - ;; - - uts4*) - lt_prog_compiler_pic_GCJ='-pic' - lt_prog_compiler_static_GCJ='-Bstatic' - ;; - - *) - lt_prog_compiler_can_build_shared_GCJ=no - ;; - esac - fi - -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6 - -# -# Check to make sure the PIC flag actually works. -# -if test -n "$lt_prog_compiler_pic_GCJ"; then - -echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5 -echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6 -if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_prog_compiler_pic_works_GCJ=no - ac_outfile=conftest.$ac_objext - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - lt_compiler_flag="$lt_prog_compiler_pic_GCJ" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - # The option is referenced via a variable to avoid confusing sed. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$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 "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 - echo "$as_me:15275: \$? = $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 - lt_prog_compiler_pic_works_GCJ=yes - fi - fi - $rm conftest* - -fi -echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5 -echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6 - -if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then - case $lt_prog_compiler_pic_GCJ in - "" | " "*) ;; - *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;; - esac -else - lt_prog_compiler_pic_GCJ= - lt_prog_compiler_can_build_shared_GCJ=no -fi - -fi -case "$host_os" in - # For platforms which do not support PIC, -DPIC is meaningless: - *djgpp*) - lt_prog_compiler_pic_GCJ= - ;; - *) - lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ" - ;; -esac - -echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5 -echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6 -if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - lt_cv_prog_compiler_c_o_GCJ=no - $rm -r conftest 2>/dev/null - mkdir conftest - cd conftest - mkdir out - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - lt_compiler_flag="-o out/conftest2.$ac_objext" - # Insert the option either (1) after the last *FLAGS variable, or - # (2) before a word containing "conftest.", or (3) at the end. - # Note that $ac_compile itself does not contain backslashes and begins - # with a dollar sign (not a hyphen), so the echo should work correctly. - lt_compile=`echo "$ac_compile" | $SED \ - -e 's:.*FLAGS}? :&$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 "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 - echo "$as_me:15335: \$? = $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 - lt_cv_prog_compiler_c_o_GCJ=yes - fi - fi - chmod u+w . - $rm conftest* - # SGI C++ compiler will create directory out/ii_files/ for - # template instantiation - test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files - $rm out/* && rmdir out - cd .. - rmdir conftest - $rm conftest* - -fi -echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5 -echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6 - - -hard_links="nottested" -if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo "$as_me:$LINENO: checking if we can lock with hard links" >&5 -echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no - touch conftest.a - ln conftest.a conftest.b 2>&5 || hard_links=no - ln conftest.a conftest.b 2>/dev/null && hard_links=no - echo "$as_me:$LINENO: result: $hard_links" >&5 -echo "${ECHO_T}$hard_links" >&6 - if test "$hard_links" = no; then - { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5 -echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;} - need_locks=warn - fi -else - need_locks=no -fi - -echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6 - - runpath_var= - allow_undefined_flag_GCJ= - enable_shared_with_static_runtimes_GCJ=no - archive_cmds_GCJ= - archive_expsym_cmds_GCJ= - old_archive_From_new_cmds_GCJ= - old_archive_from_expsyms_cmds_GCJ= - export_dynamic_flag_spec_GCJ= - whole_archive_flag_spec_GCJ= - thread_safe_flag_spec_GCJ= - hardcode_libdir_flag_spec_GCJ= - hardcode_libdir_flag_spec_ld_GCJ= - hardcode_libdir_separator_GCJ= - hardcode_direct_GCJ=no - hardcode_minus_L_GCJ=no - hardcode_shlibpath_var_GCJ=unsupported - link_all_deplibs_GCJ=unknown - hardcode_automatic_GCJ=no - module_cmds_GCJ= - module_expsym_cmds_GCJ= - always_export_symbols_GCJ=no - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - # include_expsyms should be a list of space-separated symbols to be *always* - # included in the symbol list - include_expsyms_GCJ= - # exclude_expsyms can be an extended regexp of symbols to exclude - # it will be wrapped by ` (' and `)$', so one must not match beginning or - # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', - # as well as any symbol that contains `d'. - exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_" - # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out - # platforms (ab)use it in PIC code, but their linkers get confused if - # the symbol is explicitly referenced. Since portable code cannot - # rely on this symbol name, it's probably fine to never include it in - # preloaded symbol tables. - extract_expsyms_cmds= - - case $host_os in - cygwin* | mingw* | pw32*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - if test "$GCC" != yes; then - with_gnu_ld=no - fi - ;; - openbsd*) - with_gnu_ld=no - ;; - esac - - ld_shlibs_GCJ=yes - if test "$with_gnu_ld" = yes; then - # If archive_cmds runs LD, not CC, wlarc should be empty - wlarc='${wl}' - - # See if GNU ld supports shared libraries. - case $host_os in - aix3* | aix4* | aix5*) - # On AIX/PPC, the GNU linker is very broken - if test "$host_cpu" != ia64; then - ld_shlibs_GCJ=no - cat <&2 - -*** Warning: the GNU linker, at least up to release 2.9.1, is reported -*** to be unable to reliably create shared libraries on AIX. -*** Therefore, libtool is disabling shared libraries support. If you -*** really care for shared libraries, you may want to modify your PATH -*** so that a non-GNU linker is found, and then restart. - -EOF - fi - ;; - - amigaos*) - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - - # Samuel A. Falvo II reports - # that the semantics of dynamic libraries on AmigaOS, at least up - # to version 4, is to share data among multiple programs linked - # with the same dynamic library. Since this doesn't match the - # behavior of shared libraries on other platforms, we can't use - # them. - ld_shlibs_GCJ=no - ;; - - beos*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - allow_undefined_flag_GCJ=unsupported - # Joseph Beckenbach says some releases of gcc - # support --undefined. This deserves some investigation. FIXME - archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; - - cygwin* | mingw* | pw32*) - # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless, - # as there is no search path for DLLs. - hardcode_libdir_flag_spec_GCJ='-L$libdir' - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=no - enable_shared_with_static_runtimes_GCJ=yes - export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /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' - # 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 - cp $export_symbols $output_objdir/$soname.def; - else - echo EXPORTS > $output_objdir/$soname.def; - cat $export_symbols >> $output_objdir/$soname.def; - fi~ - $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib' - else - ld_shlibs=no - fi - ;; - - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' - wlarc= - else - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - fi - ;; - - solaris* | sysv5*) - if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then - ld_shlibs_GCJ=no - cat <&2 - -*** Warning: The releases 2.8.* of the GNU linker cannot reliably -*** create shared libraries on Solaris systems. Therefore, libtool -*** is disabling shared libraries support. We urge you to upgrade GNU -*** binutils to release 2.9.1 or newer. Another option is to modify -*** your PATH or compiler configuration so that the native linker is -*** used, and then restart. - -EOF - elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; - - sunos4*) - archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' - wlarc= - hardcode_direct_GCJ=yes - 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' - archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' - else - ld_shlibs_GCJ=no - fi - ;; - 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 - fi - else - # PORTME fill in a description of your system's linker (not GNU ld) - case $host_os in - aix3*) - allow_undefined_flag_GCJ=unsupported - always_export_symbols_GCJ=yes - archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' - # 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 - # Neither direct hardcoding nor static linking is supported with a - # broken collect2. - hardcode_direct_GCJ=unsupported - fi - ;; - - aix4* | aix5*) - if test "$host_cpu" = ia64; then - # On IA64, the linker does run time linking by default, so we don't - # have to do anything special. - aix_use_runtimelinking=no - exp_sym_flag='-Bexport' - no_entry_flag="" - else - # If we're using GNU nm, then we don't want the "-C" option. - # -C means demangle to AIX nm, but means don't demangle with GNU nm - if $NM -V 2>&1 | grep 'GNU' > /dev/null; then - export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - else - export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols' - fi - aix_use_runtimelinking=no - - # Test if we are trying to use run time linking or normal - # AIX style linking. If -brtl is somewhere in LDFLAGS, we - # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) - for ld_flag in $LDFLAGS; do - if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then - aix_use_runtimelinking=yes - break - fi - done - esac - - exp_sym_flag='-bexport' - no_entry_flag='-bnoentry' - fi - - # When large executables or shared objects are built, AIX ld can - # have problems creating the table of contents. If linking a library - # or program results in "error TOC overflow" add -mminimal-toc to - # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not - # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. - - archive_cmds_GCJ='' - hardcode_direct_GCJ=yes - hardcode_libdir_separator_GCJ=':' - link_all_deplibs_GCJ=yes - - if test "$GCC" = yes; then - case $host_os in aix4.012|aix4.012.*) - # We only want to do this on AIX 4.2 and lower, the check - # below for broken collect2 doesn't work under 4.3+ - collect2name=`${CC} -print-prog-name=collect2` - if test -f "$collect2name" && \ - strings "$collect2name" | grep resolve_lib_name >/dev/null - then - # We have reworked collect2 - hardcode_direct_GCJ=yes - else - # We have old collect2 - hardcode_direct_GCJ=unsupported - # It fails to find uninstalled libraries when the uninstalled - # path is not listed in the libpath. Setting hardcode_minus_L - # to unsupported forces relinking - hardcode_minus_L_GCJ=yes - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_libdir_separator_GCJ= - fi - esac - shared_flag='-shared' - else - # not using gcc - if test "$host_cpu" = ia64; then - # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release - # chokes on -Wl,-G. The following line is correct: - shared_flag='-G' - else - if test "$aix_use_runtimelinking" = yes; then - shared_flag='${wl}-G' - else - shared_flag='${wl}-bM:SRE' - fi - fi - fi - - # It seems that -bexpall does not export symbols beginning with - # underscore (_), so it is better to generate a list of symbols to export. - always_export_symbols_GCJ=yes - if test "$aix_use_runtimelinking" = yes; then - # Warning - without using the other runtime loading flags (-brtl), - # -berok will link without error, but may produce a broken library. - allow_undefined_flag_GCJ='-berok' - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - 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 - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $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" - 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" - else - # Determine the default libpath from the value encoded in an empty executable. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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 - -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'` -# Check for a 64-bit object if we didn't find anything. -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; } -}'`; fi -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi - - hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath" - # Warning - without using the other run time loading flags, - # -berok will link without error, but may produce a broken library. - no_undefined_flag_GCJ=' ${wl}-bernotok' - allow_undefined_flag_GCJ=' ${wl}-berok' - # -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=' ' - 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' - fi - fi - ;; - - amigaos*) - archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - # see comment about different semantics on the GNU ld section - ld_shlibs_GCJ=no - ;; - - bsdi4*) - export_dynamic_flag_spec_GCJ=-rdynamic - ;; - - cygwin* | mingw* | pw32*) - # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. - # hardcode_libdir_flag_spec is actually meaningless, as there is - # no search path for DLLs. - hardcode_libdir_flag_spec_GCJ=' ' - allow_undefined_flag_GCJ=unsupported - # Tell ltmain to make .lib files, not .a files. - libext=lib - # Tell ltmain to make .dll files, not .so files. - shrext_cmds=".dll" - # FIXME: Setting linknames here is a bad hack. - archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames=' - # The linker will automatically build a .lib file if we build a DLL. - 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"`' - 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 - ;; - 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}' - hardcode_direct_GCJ=no - hardcode_automatic_GCJ=yes - hardcode_shlibpath_var_GCJ=unsupported - whole_archive_flag_spec_GCJ='-all_load $convenience' - link_all_deplibs_GCJ=yes - else - ld_shlibs_GCJ=no - fi - ;; - - dgux*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_shlibpath_var_GCJ=no - ;; - - freebsd1*) - ld_shlibs_GCJ=no - ;; - - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor - # support. Future versions do this automatically, but an explicit c++rt0.o - # does not break anything, and helps significantly (at the cost of a little - # extra space). - freebsd2.2*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - - # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - - # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | 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 - ;; - - hpux9*) - if test "$GCC" = yes; then - archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - else - archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' - fi - hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_direct_GCJ=yes - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - export_dynamic_flag_spec_GCJ='${wl}-E' - ;; - - hpux10* | hpux11*) - if test "$GCC" = yes -a "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*|ia64*) - archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -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' - ;; - *) - archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_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_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' - - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L_GCJ=yes - ;; - esac - fi - ;; - - irix5* | irix6* | nonstopux*) - if test "$GCC" = yes; then - archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir' - fi - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - link_all_deplibs_GCJ=yes - ;; - - netbsd* | netbsdelf*-gnu | knetbsd*-gnu) - if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out - else - archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF - fi - hardcode_libdir_flag_spec_GCJ='-R$libdir' - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - - newsos6) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - hardcode_shlibpath_var_GCJ=no - ;; - - openbsd*) - hardcode_direct_GCJ=yes - hardcode_shlibpath_var_GCJ=no - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - export_dynamic_flag_spec_GCJ='${wl}-E' - else - case $host_os in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-R$libdir' - ;; - *) - archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir' - ;; - esac - fi - ;; - - os2*) - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_minus_L_GCJ=yes - allow_undefined_flag_GCJ=unsupported - archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' - old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' - ;; - - osf3*) - if test "$GCC" = yes; then - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - else - allow_undefined_flag_GCJ=' -expect_unresolved \*' - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - fi - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - hardcode_libdir_separator_GCJ=: - ;; - - osf4* | osf5*) # as osf3* with the addition of -msym flag - if test "$GCC" = yes; then - allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*' - archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' - hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir' - else - allow_undefined_flag_GCJ=' -expect_unresolved \*' - archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib' - archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~ - $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp' - - # Both c and cxx compiler support -rpath directly - hardcode_libdir_flag_spec_GCJ='-rpath $libdir' - fi - 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 - 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 - 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' - fi - hardcode_libdir_flag_spec_GCJ='-R$libdir' - 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' ;; - esac - link_all_deplibs_GCJ=yes - ;; - - sunos4*) - if test "x$host_vendor" = xsequent; then - # Use $CC to link under sequent, because it throws in some extra .o - # files that make .init and .fini sections work. - archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' - else - archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' - fi - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=yes - hardcode_shlibpath_var_GCJ=no - ;; - - sysv4) - case $host_vendor in - sni) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes # is this really true??? - ;; - siemens) - ## LD is ld it makes a PLAMLIB - ## CC just makes a GrossModule. - archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' - reload_cmds_GCJ='$CC -r -o $output$reload_objs' - hardcode_direct_GCJ=no - ;; - motorola) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie - ;; - esac - runpath_var='LD_RUN_PATH' - hardcode_shlibpath_var_GCJ=no - ;; - - sysv4.3*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - export_dynamic_flag_spec_GCJ='-Bexport' - ;; - - sysv4*MP*) - if test -d /usr/nec; then - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_shlibpath_var_GCJ=no - runpath_var=LD_RUN_PATH - hardcode_runpath_var=yes - ld_shlibs_GCJ=yes - fi - ;; - - sysv4.2uw2*) - archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags' - hardcode_direct_GCJ=yes - hardcode_minus_L_GCJ=no - hardcode_shlibpath_var_GCJ=no - hardcode_runpath_var=yes - 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' - else - archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$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= - hardcode_shlibpath_var_GCJ=no - runpath_var='LD_RUN_PATH' - ;; - - uts4*) - archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' - hardcode_libdir_flag_spec_GCJ='-L$libdir' - hardcode_shlibpath_var_GCJ=no - ;; - - *) - ld_shlibs_GCJ=no - ;; - esac - fi - -echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5 -echo "${ECHO_T}$ld_shlibs_GCJ" >&6 -test "$ld_shlibs_GCJ" = no && can_build_shared=no - -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? -# -case "x$archive_cmds_need_lc_GCJ" in -x|xyes) - # Assume -lc should be added - archive_cmds_need_lc_GCJ=yes - - if test "$enable_shared" = yes && test "$GCC" = yes; then - case $archive_cmds_GCJ in - *'~'*) - # FIXME: we may have to deal with multi-command sequences. - ;; - '$CC '*) - # Test whether the compiler implicitly links with -lc since on some - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5 -echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6 - $rm conftest* - printf "$lt_simple_compile_test_code" > conftest.$ac_ext - - if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext - deplibs= - wl=$lt_prog_compiler_wl_GCJ - compiler_flags=-v - linker_flags=-v - verstring= - output_objdir=. - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ - allow_undefined_flag_GCJ= - if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5 - (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - then - archive_cmds_need_lc_GCJ=no - else - archive_cmds_need_lc_GCJ=yes - fi - allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag - else - cat conftest.err 1>&5 - fi - $rm conftest* - echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5 -echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6 - ;; - esac - fi - ;; -esac - -echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5 -echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6 -library_names_spec= -libname_spec='lib$name' -soname_spec= -shrext_cmds=".so" -postinstall_cmds= -postuninstall_cmds= -finish_cmds= -finish_eval= -shlibpath_var= -shlibpath_overrides_runpath=unknown -version_type=none -dynamic_linker="$host_os ld.so" -sys_lib_dlsearch_path_spec="/lib /usr/lib" -if test "$GCC" = yes; then - sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` - if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. - 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 -else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -fi -need_lib_prefix=unknown -hardcode_into_libs=no - -# when you set need_version to no, make sure it does not cause -set_version -# flags to be left without arguments -need_version=unknown - -case $host_os in -aix3*) - version_type=linux - library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' - shlibpath_var=LIBPATH - - # AIX 3 has no versioning support, so we append a major version to the name. - soname_spec='${libname}${release}${shared_ext}$major' - ;; - -aix4* | aix5*) - version_type=linux - need_lib_prefix=no - need_version=no - hardcode_into_libs=yes - if test "$host_cpu" = ia64; then - # AIX 5 supports IA64 - library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' - shlibpath_var=LD_LIBRARY_PATH - else - # With GCC up to 2.95.x, collect2 would create an import file - # for dependence libraries. The import file would start with - # the line `#! .'. This would cause the generated library to - # depend on `.', always an invalid library. This was fixed in - # development snapshots of GCC prior to 3.0. - case $host_os in - aix4 | aix4.[01] | aix4.[01].*) - if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' - echo ' yes ' - echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then - : - else - can_build_shared=no - fi - ;; - esac - # AIX (on Power*) has no versioning support, so currently we can not hardcode correct - # soname into executable. Probably we can add versioning support to - # collect2, so additional links can be useful in future. - if test "$aix_use_runtimelinking" = yes; then - # If using run time linking (on AIX 4.2 or later) use lib.so - # instead of lib.a to let people know that these are not - # typical AIX shared libraries. - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' - else - # We preserve .a as extension for shared libraries through AIX4.2 - # and later when we are not doing run time linking. - library_names_spec='${libname}${release}.a $libname.a' - soname_spec='${libname}${release}${shared_ext}$major' - fi - shlibpath_var=LIBPATH - fi - ;; - -amigaos*) - library_names_spec='$libname.ixlibrary $libname.a' - # Create ${libname}_ixlibrary.a entries in /sys/libs. - finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' - ;; - -beos*) - library_names_spec='${libname}${shared_ext}' - dynamic_linker="$host_os ld.so" - shlibpath_var=LIBRARY_PATH - ;; - -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 declares shl_load. - For example, HP-UX 11i declares gettimeofday. */ -#define shl_load innocuous_shl_load - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shl_load (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shl_load - -/* Override any 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 declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any 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 - -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. */ - -/* 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 - -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 - - -fi - - -fi - - -fi - - -fi - - -fi - - ;; - esac - - if test "x$lt_cv_dlopen" != xno; then - enable_dlopen=yes - else - enable_dlopen=no - fi - - case $lt_cv_dlopen in - dlopen) - save_CPPFLAGS="$CPPFLAGS" - test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" - - save_LDFLAGS="$LDFLAGS" - eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" - - save_LIBS="$LIBS" - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5 -echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6 -if test "${lt_cv_dlopen_self+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then : - lt_cv_dlopen_self=cross -else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - 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* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self" >&6 - - if test "x$lt_cv_dlopen_self" = xyes; then - 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 < -#endif - -#include - -#ifdef RTLD_GLOBAL -# define LT_DLGLOBAL RTLD_GLOBAL -#else -# ifdef DL_GLOBAL -# define LT_DLGLOBAL DL_GLOBAL -# else -# define LT_DLGLOBAL 0 -# endif -#endif - -/* We may have to define LT_DLLAZY_OR_NOW in the command line if we - find out it does not work in some platform. */ -#ifndef LT_DLLAZY_OR_NOW -# ifdef RTLD_LAZY -# define LT_DLLAZY_OR_NOW RTLD_LAZY -# else -# ifdef DL_LAZY -# define LT_DLLAZY_OR_NOW DL_LAZY -# else -# ifdef RTLD_NOW -# define LT_DLLAZY_OR_NOW RTLD_NOW -# else -# ifdef DL_NOW -# define LT_DLLAZY_OR_NOW DL_NOW -# else -# define LT_DLLAZY_OR_NOW 0 -# endif -# endif -# endif -# endif -#endif - -#ifdef __cplusplus -extern "C" void exit (int); -#endif - -void fnord() { int i=42;} -int main () -{ - void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); - int status = $lt_dlunknown; - - if (self) - { - if (dlsym (self,"fnord")) status = $lt_dlno_uscore; - else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; - /* dlclose (self); */ - } - - 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* - - -fi -echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5 -echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6 - fi - - CPPFLAGS="$save_CPPFLAGS" - LDFLAGS="$save_LDFLAGS" - LIBS="$save_LIBS" - ;; - esac - - case $lt_cv_dlopen_self in - yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; - *) enable_dlopen_self=unknown ;; - esac - - case $lt_cv_dlopen_self_static in - yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; - *) enable_dlopen_self_static=unknown ;; - esac -fi - - -# 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_GCJ \ - CC_GCJ \ - LD_GCJ \ - lt_prog_compiler_wl_GCJ \ - lt_prog_compiler_pic_GCJ \ - lt_prog_compiler_static_GCJ \ - lt_prog_compiler_no_builtin_flag_GCJ \ - export_dynamic_flag_spec_GCJ \ - thread_safe_flag_spec_GCJ \ - whole_archive_flag_spec_GCJ \ - enable_shared_with_static_runtimes_GCJ \ - old_archive_cmds_GCJ \ - old_archive_from_new_cmds_GCJ \ - predep_objects_GCJ \ - postdep_objects_GCJ \ - predeps_GCJ \ - postdeps_GCJ \ - compiler_lib_search_path_GCJ \ - archive_cmds_GCJ \ - archive_expsym_cmds_GCJ \ - postinstall_cmds_GCJ \ - postuninstall_cmds_GCJ \ - old_archive_from_expsyms_cmds_GCJ \ - allow_undefined_flag_GCJ \ - no_undefined_flag_GCJ \ - export_symbols_cmds_GCJ \ - hardcode_libdir_flag_spec_GCJ \ - hardcode_libdir_flag_spec_ld_GCJ \ - hardcode_libdir_separator_GCJ \ - hardcode_automatic_GCJ \ - module_cmds_GCJ \ - module_expsym_cmds_GCJ \ - lt_cv_prog_compiler_c_o_GCJ \ - exclude_expsyms_GCJ \ - include_expsyms_GCJ; do - - case $var in - old_archive_cmds_GCJ | \ - old_archive_from_new_cmds_GCJ | \ - archive_cmds_GCJ | \ - archive_expsym_cmds_GCJ | \ - module_cmds_GCJ | \ - module_expsym_cmds_GCJ | \ - old_archive_from_expsyms_cmds_GCJ | \ - export_symbols_cmds_GCJ | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_GCJ - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# A language-specific compiler. -CC=$lt_compiler_GCJ - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_GCJ - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_GCJ - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# Used on cygwin: DLL creation program. -DLLTOOL="$DLLTOOL" - -# Used on cygwin: object dumper. -OBJDUMP="$OBJDUMP" - -# Used on cygwin: assembler. -AS="$AS" - -# The name of the directory that contains temporary libtool files. -objdir=$objdir - -# How to create reloadable object files. -reload_flag=$lt_reload_flag -reload_cmds=$lt_reload_cmds - -# How to pass a linker flag through the compiler. -wl=$lt_lt_prog_compiler_wl_GCJ - -# Object file suffix (normally "o"). -objext="$ac_objext" - -# Old archive suffix (normally "a"). -libext="$libext" - -# Shared library suffix (normally ".so"). -shrext_cmds='$shrext_cmds' - -# Executable file suffix (normally ""). -exeext="$exeext" - -# Additional compiler flags for building library objects. -pic_flag=$lt_lt_prog_compiler_pic_GCJ -pic_mode=$pic_mode - -# What is the maximum length of a command? -max_cmd_len=$lt_cv_sys_max_cmd_len - -# Does compiler simultaneously support -c and -o options? -compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ - -# Must we lock files when doing compilation ? -need_locks=$lt_need_locks - -# Do we need the lib prefix for modules? -need_lib_prefix=$need_lib_prefix - -# Do we need a version for libraries? -need_version=$need_version - -# Whether dlopen is supported. -dlopen_support=$enable_dlopen - -# Whether dlopen of programs is supported. -dlopen_self=$enable_dlopen_self - -# Whether dlopen of statically linked programs is supported. -dlopen_self_static=$enable_dlopen_self_static - -# Compiler flag to prevent dynamic linking. -link_static_flag=$lt_lt_prog_compiler_static_GCJ - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_GCJ -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_GCJ -archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_GCJ -module_expsym_cmds=$lt_module_expsym_cmds_GCJ - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_GCJ - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_GCJ - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_GCJ - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_GCJ - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_GCJ - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_GCJ - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_GCJ - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_GCJ - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_GCJ - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_GCJ - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_GCJ - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_GCJ" - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_GCJ - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_GCJ - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_GCJ - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_GCJ - -# ### END LIBTOOL TAG CONFIG: $tagname - -__EOF__ - - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - else - tagname="" - fi - ;; - - RC) - - - -# Source file extension for RC test sources. -ac_ext=rc - -# Object file extension for compiled RC test sources. -objext=o -objext_RC=$objext - -# Code to be used in simple compile tests -lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n' - -# Code to be used in simple link tests -lt_simple_link_test_code="$lt_simple_compile_test_code" - -# ltmain only uses $CC for tagged configurations so make sure $CC is set. - -# If no C compiler was specified, use CC. -LTCC=${LTCC-"$CC"} - -# Allow CC to be a program name with arguments. -compiler=$CC - - -# Allow CC to be a program name with arguments. -lt_save_CC="$CC" -CC=${RC-"windres"} -compiler=$CC -compiler_RC=$CC -lt_cv_prog_compiler_c_o_RC=yes - -# The else clause should only fire when bootstrapping the -# libtool distribution, otherwise you forgot to ship ltmain.sh -# with your package, and you will get complaints that there are -# no rules to generate ltmain.sh. -if test -f "$ltmain"; then - # See if we are running on zsh, and set the options which allow our commands through - # without removal of \ escapes. - if test -n "${ZSH_VERSION+set}" ; then - setopt NO_GLOB_SUBST - fi - # Now quote all the things that may contain metacharacters while being - # careful not to overquote the AC_SUBSTed values. We take copies of the - # variables and quote the copies for generation of the libtool script. - for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \ - SED SHELL STRIP \ - libname_spec library_names_spec soname_spec extract_expsyms_cmds \ - old_striplib striplib file_magic_cmd finish_cmds finish_eval \ - deplibs_check_method reload_flag reload_cmds need_locks \ - lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \ - lt_cv_sys_global_symbol_to_c_name_address \ - sys_lib_search_path_spec sys_lib_dlsearch_path_spec \ - old_postinstall_cmds old_postuninstall_cmds \ - compiler_RC \ - CC_RC \ - LD_RC \ - lt_prog_compiler_wl_RC \ - lt_prog_compiler_pic_RC \ - lt_prog_compiler_static_RC \ - lt_prog_compiler_no_builtin_flag_RC \ - export_dynamic_flag_spec_RC \ - thread_safe_flag_spec_RC \ - whole_archive_flag_spec_RC \ - enable_shared_with_static_runtimes_RC \ - old_archive_cmds_RC \ - old_archive_from_new_cmds_RC \ - predep_objects_RC \ - postdep_objects_RC \ - predeps_RC \ - postdeps_RC \ - compiler_lib_search_path_RC \ - archive_cmds_RC \ - archive_expsym_cmds_RC \ - postinstall_cmds_RC \ - postuninstall_cmds_RC \ - old_archive_from_expsyms_cmds_RC \ - allow_undefined_flag_RC \ - no_undefined_flag_RC \ - export_symbols_cmds_RC \ - hardcode_libdir_flag_spec_RC \ - hardcode_libdir_flag_spec_ld_RC \ - hardcode_libdir_separator_RC \ - hardcode_automatic_RC \ - module_cmds_RC \ - module_expsym_cmds_RC \ - lt_cv_prog_compiler_c_o_RC \ - exclude_expsyms_RC \ - include_expsyms_RC; do - - case $var in - old_archive_cmds_RC | \ - old_archive_from_new_cmds_RC | \ - archive_cmds_RC | \ - archive_expsym_cmds_RC | \ - module_cmds_RC | \ - module_expsym_cmds_RC | \ - old_archive_from_expsyms_cmds_RC | \ - export_symbols_cmds_RC | \ - extract_expsyms_cmds | reload_cmds | finish_cmds | \ - postinstall_cmds | postuninstall_cmds | \ - old_postinstall_cmds | old_postuninstall_cmds | \ - sys_lib_search_path_spec | sys_lib_dlsearch_path_spec) - # Double-quote double-evaled strings. - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\"" - ;; - *) - eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\"" - ;; - esac - done - - case $lt_echo in - *'\$0 --fallback-echo"') - lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'` - ;; - esac - -cfgfile="$ofile" - - cat <<__EOF__ >> "$cfgfile" -# ### BEGIN LIBTOOL TAG CONFIG: $tagname - -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: - -# Shell to use when invoking shell scripts. -SHELL=$lt_SHELL - -# Whether or not to build shared libraries. -build_libtool_libs=$enable_shared - -# Whether or not to build static libraries. -build_old_libs=$enable_static - -# Whether or not to add -lc for building shared libraries. -build_libtool_need_lc=$archive_cmds_need_lc_RC - -# Whether or not to disallow shared libs when runtime libs are static -allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC - -# Whether or not to optimize for fast installation. -fast_install=$enable_fast_install - -# The host system. -host_alias=$host_alias -host=$host - -# An echo program that does not interpret backslashes. -echo=$lt_echo - -# The archiver. -AR=$lt_AR -AR_FLAGS=$lt_AR_FLAGS - -# A C compiler. -LTCC=$lt_LTCC - -# A language-specific compiler. -CC=$lt_compiler_RC - -# Is the compiler the GNU C compiler? -with_gcc=$GCC_RC - -# An ERE matcher. -EGREP=$lt_EGREP - -# The linker used to build libraries. -LD=$lt_LD_RC - -# Whether we need hard or soft links. -LN_S=$lt_LN_S - -# A BSD-compatible nm program. -NM=$lt_NM - -# A symbol stripping program -STRIP=$lt_STRIP - -# Used to examine libraries when file_magic_cmd begins "file" -MAGIC_CMD=$MAGIC_CMD - -# 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_RC - -# 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_RC -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_RC - -# 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_RC - -# Compiler flag to turn off builtin functions. -no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC - -# Compiler flag to allow reflexive dlopens. -export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC - -# Compiler flag to generate shared objects directly from archives. -whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC - -# Compiler flag to generate thread-safe objects. -thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC - -# Library versioning type. -version_type=$version_type - -# Format of library name prefix. -libname_spec=$lt_libname_spec - -# List of archive names. First name is the real one, the rest are links. -# The last name is the one that the linker finds with -lNAME. -library_names_spec=$lt_library_names_spec - -# The coded name of the library, if different from the real name. -soname_spec=$lt_soname_spec - -# Commands used to build and install an old-style archive. -RANLIB=$lt_RANLIB -old_archive_cmds=$lt_old_archive_cmds_RC -old_postinstall_cmds=$lt_old_postinstall_cmds -old_postuninstall_cmds=$lt_old_postuninstall_cmds - -# Create an old-style archive from a shared archive. -old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC - -# Create a temporary old-style archive to link instead of a shared archive. -old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC - -# Commands used to build and install a shared archive. -archive_cmds=$lt_archive_cmds_RC -archive_expsym_cmds=$lt_archive_expsym_cmds_RC -postinstall_cmds=$lt_postinstall_cmds -postuninstall_cmds=$lt_postuninstall_cmds - -# Commands used to build a loadable module (assumed same as above if empty) -module_cmds=$lt_module_cmds_RC -module_expsym_cmds=$lt_module_expsym_cmds_RC - -# Commands to strip libraries. -old_striplib=$lt_old_striplib -striplib=$lt_striplib - -# Dependencies to place before the objects being linked to create a -# shared library. -predep_objects=$lt_predep_objects_RC - -# Dependencies to place after the objects being linked to create a -# shared library. -postdep_objects=$lt_postdep_objects_RC - -# Dependencies to place before the objects being linked to create a -# shared library. -predeps=$lt_predeps_RC - -# Dependencies to place after the objects being linked to create a -# shared library. -postdeps=$lt_postdeps_RC - -# The library search path used internally by the compiler when linking -# a shared library. -compiler_lib_search_path=$lt_compiler_lib_search_path_RC - -# Method to check whether dependent libraries are shared objects. -deplibs_check_method=$lt_deplibs_check_method - -# Command to use when deplibs_check_method == file_magic. -file_magic_cmd=$lt_file_magic_cmd - -# Flag that allows shared libraries with undefined symbols to be built. -allow_undefined_flag=$lt_allow_undefined_flag_RC - -# Flag that forces no undefined symbols. -no_undefined_flag=$lt_no_undefined_flag_RC - -# Commands used to finish a libtool library installation in a directory. -finish_cmds=$lt_finish_cmds - -# Same as above, but a single script fragment to be evaled but not shown. -finish_eval=$lt_finish_eval - -# Take the output of nm and produce a listing of raw symbols and C names. -global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe - -# Transform the output of nm in a proper C declaration -global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl - -# Transform the output of nm in a C name address pair -global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address - -# This is the shared library runtime path variable. -runpath_var=$runpath_var - -# This is the shared library path variable. -shlibpath_var=$shlibpath_var - -# Is shlibpath searched before the hard-coded library search path? -shlibpath_overrides_runpath=$shlibpath_overrides_runpath - -# How to hardcode a shared library path into an executable. -hardcode_action=$hardcode_action_RC - -# Whether we should hardcode library paths into libraries. -hardcode_into_libs=$hardcode_into_libs - -# Flag to hardcode \$libdir into a binary during linking. -# This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC - -# If ld is used when linking, flag to hardcode \$libdir into -# a binary during linking. This must work even if \$libdir does -# not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC - -# Whether we need a single -rpath flag with a separated argument. -hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC - -# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the -# resulting binary. -hardcode_direct=$hardcode_direct_RC - -# Set to yes if using the -LDIR flag during linking hardcodes DIR into the -# resulting binary. -hardcode_minus_L=$hardcode_minus_L_RC - -# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into -# the resulting binary. -hardcode_shlibpath_var=$hardcode_shlibpath_var_RC - -# Set to yes if building a shared library automatically hardcodes DIR into the library -# and all subsequent libraries and executables linked against it. -hardcode_automatic=$hardcode_automatic_RC - -# Variables whose values should be saved in libtool wrapper scripts and -# restored at relink time. -variables_saved_for_relink="$variables_saved_for_relink" - -# Whether libtool must link a program against all its dependency libraries. -link_all_deplibs=$link_all_deplibs_RC - -# Compile-time system search path for libraries -sys_lib_search_path_spec=$lt_sys_lib_search_path_spec - -# Run-time system search path for libraries -sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec - -# Fix the shell variable \$srcfile for the compiler. -fix_srcfile_path="$fix_srcfile_path_RC" - -# Set to yes if exported symbols are required. -always_export_symbols=$always_export_symbols_RC - -# The commands to list exported symbols. -export_symbols_cmds=$lt_export_symbols_cmds_RC - -# The commands to extract the exported symbol list from a shared archive. -extract_expsyms_cmds=$lt_extract_expsyms_cmds - -# Symbols that should not be listed in the preloaded symbols. -exclude_expsyms=$lt_exclude_expsyms_RC - -# Symbols that must always be exported. -include_expsyms=$lt_include_expsyms_RC - -# ### END LIBTOOL TAG CONFIG: $tagname - -__EOF__ - - -else - # If there is no Makefile yet, we rely on a make rule to execute - # `config.status --recheck' to rerun these tests and create the - # libtool script then. - ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'` - if test -f "$ltmain_in"; then - test -f Makefile && make "$ltmain" - fi -fi - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -CC="$lt_save_CC" - - ;; - - *) - { { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5 -echo "$as_me: error: Unsupported tag name: $tagname" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - - # Append the new tag name to the list of available tags. - if test -n "$tagname" ; then - available_tags="$available_tags $tagname" - fi - fi - done - IFS="$lt_save_ifs" - - # Now substitute the updated list of available tags. - if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then - mv "${ofile}T" "$ofile" - chmod +x "$ofile" - else - rm -f "${ofile}T" - { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5 -echo "$as_me: error: unable to update list of available tagged configurations." >&2;} - { (exit 1); exit 1; }; } - fi -fi - - - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -# Prevent multiple expansion - - - - - - - - - - - - - - - - - - - - - - - - - ac_config_headers="$ac_config_headers src/config.h" - - ac_config_commands="$ac_config_commands default-1" - - - - - - - echo "$as_me:$LINENO: checking for strerror in -lcposix" >&5 -echo $ECHO_N "checking for strerror in -lcposix... $ECHO_C" >&6 -if test "${ac_cv_lib_cposix_strerror+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lcposix $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 strerror (); -int -main () -{ -strerror (); - ; - 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_cposix_strerror=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_cposix_strerror=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_cposix_strerror" >&5 -echo "${ECHO_T}$ac_cv_lib_cposix_strerror" >&6 -if test $ac_cv_lib_cposix_strerror = yes; then - LIBS="$LIBS -lcposix" -fi - - - -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu -if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -set dummy ${ac_tool_prefix}gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. -set dummy gcc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="gcc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -set dummy ${ac_tool_prefix}cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="${ac_tool_prefix}cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - CC=$ac_ct_CC -else - CC="$ac_cv_prog_CC" -fi - -fi -if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. -set dummy cc; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else - ac_prog_rejected=no -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. - set dummy $ac_cv_prog_CC - shift - if test $# != 0; then - # We chose a different compiler from the bogus one. - # However, it has the same basename, so the bogon will be chosen - # first if we set CC to just the basename; use the full file name. - shift - ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" - fi -fi -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi -if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - for ac_prog in cl - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -CC=$ac_cv_prog_CC -if test -n "$CC"; then - echo "$as_me:$LINENO: result: $CC" >&5 -echo "${ECHO_T}$CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$CC" && break - done -fi -if test -z "$CC"; then - ac_ct_CC=$CC - for ac_prog in cl -do - # Extract the first word of "$ac_prog", so it can be a program name with args. -set dummy $ac_prog; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_ac_ct_CC="$ac_prog" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -ac_ct_CC=$ac_cv_prog_ac_ct_CC -if test -n "$ac_ct_CC"; then - echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -echo "${ECHO_T}$ac_ct_CC" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - test -n "$ac_ct_CC" && break -done - - CC=$ac_ct_CC -fi - -fi - - -test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&5 -echo "$as_me: error: no acceptable C compiler found in \$PATH -See \`config.log' for more details." >&2;} - { (exit 1); exit 1; }; } - -# Provide some information about the compiler. -echo "$as_me:$LINENO:" \ - "checking for C compiler version" >&5 -ac_compiler=`set X $ac_compile; echo $2` -{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 - (eval $ac_compiler --version &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 - (eval $ac_compiler -v &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } -{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 - (eval $ac_compiler -V &5) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - -echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -if test "${ac_cv_c_compiler_gnu+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -#ifndef __GNUC__ - choke me -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_compiler_gnu=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_compiler_gnu=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_cv_c_compiler_gnu=$ac_compiler_gnu - -fi -echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -GCC=`test $ac_compiler_gnu = yes && echo yes` -ac_test_CFLAGS=${CFLAGS+set} -ac_save_CFLAGS=$CFLAGS -CFLAGS="-g" -echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_g+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_prog_cc_g=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_prog_cc_g=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS -elif test $ac_cv_prog_cc_g = yes; then - if test "$GCC" = yes; then - CFLAGS="-g -O2" - else - CFLAGS="-g" - fi -else - if test "$GCC" = yes; then - CFLAGS="-O2" - else - CFLAGS= - fi -fi -echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -if test "${ac_cv_prog_cc_stdc+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_prog_cc_stdc=no -ac_save_CC=$CC -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include -#include -/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -struct buf { int x; }; -FILE * (*rcsopen) (struct buf *, struct stat *, int); -static char *e (p, i) - char **p; - int i; -{ - return p[i]; -} -static char *f (char * (*g) (char **, int), char **p, ...) -{ - char *s; - va_list v; - va_start (v,p); - s = g (p, va_arg (v,int)); - va_end (v); - return s; -} - -/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std1 is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std1. */ -int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -int test (int i, double x); -struct s1 {int (*f) (int a);}; -struct s2 {int (*f) (double a);}; -int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -int argc; -char **argv; -int -main () -{ -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; - ; - return 0; -} -_ACEOF -# Don't try gcc -ansi; that turns off useful extensions and -# breaks some systems' header files. -# AIX -qlanglvl=ansi -# Ultrix and OSF/1 -std1 -# HP-UX 10.20 and later -Ae -# HP-UX older versions -Aa -D_HPUX_SOURCE -# SVR4 -Xc -D__EXTENSIONS__ -for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_prog_cc_stdc=$ac_arg -break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext -done -rm -f conftest.$ac_ext conftest.$ac_objext -CC=$ac_save_CC - -fi - -case "x$ac_cv_prog_cc_stdc" in - x|xno) - echo "$as_me:$LINENO: result: none needed" >&5 -echo "${ECHO_T}none needed" >&6 ;; - *) - echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 - CC="$CC $ac_cv_prog_cc_stdc" ;; -esac - -# Some people use a C++ compiler to compile C. Since we use `exit', -# in C++ we need to declare it. In case someone uses the same compiler -# for both compiling C and C++ we need to have the C++ compiler decide -# the declaration of exit, since it's the most demanding environment. -cat >conftest.$ac_ext <<_ACEOF -#ifndef __cplusplus - choke me -#endif -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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 - for ac_declaration in \ - '' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -#include -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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 - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -continue -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_declaration -int -main () -{ -exit (42); - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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 - break -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -done -rm -f conftest* -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - -#AC_PROG_RANLIB -echo "$as_me:$LINENO: checking whether ln -s works" >&5 -echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6 -LN_S=$as_ln_s -if test "$LN_S" = "ln -s"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 -else - echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -echo "${ECHO_T}no, using $LN_S" >&6 -fi - -if test $ac_cv_c_compiler_gnu = yes; then - echo "$as_me:$LINENO: checking whether $CC needs -traditional" >&5 -echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6 -if test "${ac_cv_prog_gcc_traditional+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_pattern="Autoconf.*'x'" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -Autoconf TIOCGETP -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes -else - ac_cv_prog_gcc_traditional=no -fi -rm -f conftest* - - - if test $ac_cv_prog_gcc_traditional = no; then - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -Autoconf TCGETA -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "$ac_pattern" >/dev/null 2>&1; then - ac_cv_prog_gcc_traditional=yes -fi -rm -f conftest* - - fi -fi -echo "$as_me:$LINENO: result: $ac_cv_prog_gcc_traditional" >&5 -echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6 - if test $ac_cv_prog_gcc_traditional = yes; then - CC="$CC -traditional" - fi -fi - - - - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - - -_bindir=`eval echo $bindir` -_bindir=`eval echo $_bindir` - -_libdir=`eval echo $libdir` -_libdir=`eval echo $_libdir` -lib_search_path="-L$_libdir" - -inc_search_path=`eval echo $includedir` -inc_search_path="-I`eval echo $inc_search_path`" - - - - - - -# Check whether --with-libs-from or --without-libs-from was given. -if test "${with_libs_from+set}" = set; then - withval="$with_libs_from" - lib_search_path="$withval $lib_search_path" -fi; - - -# Check whether --with-incs-from or --without-incs-from was given. -if test "${with_incs_from+set}" = set; then - withval="$with_incs_from" - inc_search_path="$withval $inc_search_path" -fi; - - - - -for ac_func in vprintf -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any 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 $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - 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 - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -echo "$as_me:$LINENO: checking for _doprnt" >&5 -echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6 -if test "${ac_cv_func__doprnt+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 _doprnt to an innocuous variant, in case declares _doprnt. - For example, HP-UX 11i declares gettimeofday. */ -#define _doprnt innocuous__doprnt - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char _doprnt (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef _doprnt - -/* 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 _doprnt (); -/* 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__doprnt) || defined (__stub____doprnt) -choke me -#else -char (*f) () = _doprnt; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != _doprnt; - ; - 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__doprnt=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func__doprnt=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func__doprnt" >&5 -echo "${ECHO_T}$ac_cv_func__doprnt" >&6 -if test $ac_cv_func__doprnt = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_DOPRNT 1 -_ACEOF - -fi - -fi -done - - -# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -# for constant arguments. Useless! -echo "$as_me:$LINENO: checking for working alloca.h" >&5 -echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 -if test "${ac_cv_working_alloca_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -char *p = (char *) alloca (2 * sizeof (int)); - ; - 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_working_alloca_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_working_alloca_h=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 -echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 -if test $ac_cv_working_alloca_h = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA_H 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking for alloca" >&5 -echo $ECHO_N "checking for alloca... $ECHO_C" >&6 -if test "${ac_cv_func_alloca_works+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. */ -#ifdef __GNUC__ -# define alloca __builtin_alloca -#else -# ifdef _MSC_VER -# include -# define alloca _alloca -# else -# if HAVE_ALLOCA_H -# include -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca /* predefined by HP cc +Olibcalls */ -char *alloca (); -# endif -# endif -# endif -# endif -#endif - -int -main () -{ -char *p = (char *) alloca (1); - ; - 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_alloca_works=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_alloca_works=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 -echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 - -if test $ac_cv_func_alloca_works = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ALLOCA 1 -_ACEOF - -else - # The SVR3 libPW and SVR4 libucb both contain incompatible functions -# that cause trouble. Some versions do not even contain alloca or -# contain a buggy version. If you still want to use their alloca, -# use ar to extract alloca.o from them instead of compiling alloca.c. - -ALLOCA=alloca.$ac_objext - -cat >>confdefs.h <<\_ACEOF -#define C_ALLOCA 1 -_ACEOF - - -echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 -echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 -if test "${ac_cv_os_cray+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#if defined(CRAY) && ! defined(CRAY2) -webecray -#else -wenotbecray -#endif - -_ACEOF -if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "webecray" >/dev/null 2>&1; then - ac_cv_os_cray=yes -else - ac_cv_os_cray=no -fi -rm -f conftest* - -fi -echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 -echo "${ECHO_T}$ac_cv_os_cray" >&6 -if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any 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 $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - 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 - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - -cat >>confdefs.h <<_ACEOF -#define CRAY_STACKSEG_END $ac_func -_ACEOF - - break -fi - - done -fi - -echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 -echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 -if test "${ac_cv_c_stack_direction+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test "$cross_compiling" = yes; then - ac_cv_c_stack_direction=0 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int -find_stack_direction () -{ - static char *addr = 0; - auto char dummy; - if (addr == 0) - { - addr = &dummy; - return find_stack_direction (); - } - else - return (&dummy > addr) ? 1 : -1; -} - -int -main () -{ - exit (find_stack_direction () < 0); -} -_ACEOF -rm -f conftest$ac_exeext -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); } && { ac_try='./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_c_stack_direction=1 -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -ac_cv_c_stack_direction=-1 -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 -echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 - -cat >>confdefs.h <<_ACEOF -#define STACK_DIRECTION $ac_cv_c_stack_direction -_ACEOF - - -fi - - - - - - - - - - - - - - - -for ac_func in gethostname select poll strerror strcasecmp strncasecmp \ - setsid atexit mallinfo mkstemp snprintf vsnprintf asprintf \ - vasprintf -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any 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 $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - 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 - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - - -echo "$as_me:$LINENO: checking for C99 vsnprintf" >&5 -echo $ECHO_N "checking for C99 vsnprintf... $ECHO_C" >&6 -if test "${_cv_HAVE_C99_VSNPRINTF+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - -if test "$cross_compiling" = yes; then - _cv_HAVE_C99_VSNPRINTF=cross -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -#include -#include -void foo(const char *format, ...) { - va_list ap; - int len; - char buf[5]; - - va_start(ap, format); - len = vsnprintf(0, 0, format, ap); - va_end(ap); - if (len != 5) exit(1); - - if (snprintf(buf, 3, "hello") != 5 || strcmp(buf, "he") != 0) exit(1); - - exit(0); -} -main() { foo("hello"); } - -_ACEOF -rm -f conftest$ac_exeext -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); } && { ac_try='./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 - _cv_HAVE_C99_VSNPRINTF=yes -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) -_cv_HAVE_C99_VSNPRINTF=no -fi -rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi -fi -echo "$as_me:$LINENO: result: $_cv_HAVE_C99_VSNPRINTF" >&5 -echo "${ECHO_T}$_cv_HAVE_C99_VSNPRINTF" >&6 -if test x"$_cv_HAVE_C99_VSNPRINTF" = x"yes"; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_C99_VSNPRINTF 1 -_ACEOF - -fi - -DLLIBS="" - -echo "$as_me:$LINENO: checking for dlopen" >&5 -echo $ECHO_N "checking for dlopen... $ECHO_C" >&6 -if test "${ac_cv_func_dlopen+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define dlopen to an innocuous variant, in case declares dlopen. - For example, HP-UX 11i declares gettimeofday. */ -#define dlopen innocuous_dlopen - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char dlopen (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef dlopen - -/* Override any 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 - HAVEDL="yes" -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 - DLLIBS="-ldl" HAVEDL="yes" -else - DLLIBS="" -fi - -fi - - -if test "x$HAVEDL" = xyes; then - -for ac_header in dlfcn.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - -fi - - - -if test "x$CPP_PATH" = x; then - # Extract the first word of "cpp", so it can be a program name with args. -set dummy cpp; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_path_CPP_PATH+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - case $CPP_PATH in - [\\/]* | ?:[\\/]*) - ac_cv_path_CPP_PATH="$CPP_PATH" # Let the user override the test with a path. - ;; - *) - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_dummy="$PATH:/lib:/usr/bin:/bin:/usr/lib:/usr/ccs/lib" -for as_dir in $as_dummy -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_path_CPP_PATH="$as_dir/$ac_word$ac_exec_ext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - - test -z "$ac_cv_path_CPP_PATH" && ac_cv_path_CPP_PATH="notfound" - ;; -esac -fi -CPP_PATH=$ac_cv_path_CPP_PATH - -if test -n "$CPP_PATH"; then - echo "$as_me:$LINENO: result: $CPP_PATH" >&5 -echo "${ECHO_T}$CPP_PATH" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi - -if test "$CPP_PATH" = "/usr/ccs/lib/cpp" -o "$CPP_PATH" = "notfound" ; then - if test "$GCC" = "yes"; then - CPP_PATH="gcc -E -x c" - else - if test "$CPP_PATH" = "/usr/ccs/lib/cpp"; then - CPP_PATH="$CPP_PATH -B" - else - echo "cpp, the C preprocessor was not found in your system." - echo "Create a symbolic link from it to /lib/cpp and rerun configure" - exit - fi - fi -fi - -cat >>confdefs.h <<_ACEOF -#define CPP_PATH "$CPP_PATH" -_ACEOF - - - - -echo "$as_me:$LINENO: checking for sys/wait.h that is POSIX.1 compatible" >&5 -echo $ECHO_N "checking for sys/wait.h that is POSIX.1 compatible... $ECHO_C" >&6 -if test "${ac_cv_header_sys_wait_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#ifndef WEXITSTATUS -# define WEXITSTATUS(stat_val) ((unsigned)(stat_val) >> 8) -#endif -#ifndef WIFEXITED -# define WIFEXITED(stat_val) (((stat_val) & 255) == 0) -#endif - -int -main () -{ - int s; - wait (&s); - s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_header_sys_wait_h=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_sys_wait_h=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_sys_wait_h" >&5 -echo "${ECHO_T}$ac_cv_header_sys_wait_h" >&6 -if test $ac_cv_header_sys_wait_h = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_SYS_WAIT_H 1 -_ACEOF - -fi - -echo "$as_me:$LINENO: checking whether time.h and sys/time.h may both be included" >&5 -echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6 -if test "${ac_cv_header_time+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#include - -int -main () -{ -if ((struct tm *) 0) -return 0; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_header_time=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_header_time=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_header_time" >&5 -echo "${ECHO_T}$ac_cv_header_time" >&6 -if test $ac_cv_header_time = yes; then - -cat >>confdefs.h <<\_ACEOF -#define TIME_WITH_SYS_TIME 1 -_ACEOF - -fi - - - - - - - - - - - - - -for ac_header in fcntl.h limits.h sys/ioctl.h sys/time.h sys/types.h \ - libintl.h sys/select.h poll.h malloc.h ctype.h string.h \ - strings.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - - - -echo "$as_me:$LINENO: checking whether sys_siglist is declared" >&5 -echo $ECHO_N "checking whether sys_siglist is declared... $ECHO_C" >&6 -if test "${ac_cv_have_decl_sys_siglist+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -/* NetBSD declares sys_siglist in unistd.h. */ -#if HAVE_UNISTD_H -# include -#endif - - -int -main () -{ -#ifndef sys_siglist - char *p = (char *) sys_siglist; -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_have_decl_sys_siglist=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_have_decl_sys_siglist=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_have_decl_sys_siglist" >&5 -echo "${ECHO_T}$ac_cv_have_decl_sys_siglist" >&6 -if test $ac_cv_have_decl_sys_siglist = yes; then - -cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SYS_SIGLIST 1 -_ACEOF - - -else - cat >>confdefs.h <<_ACEOF -#define HAVE_DECL_SYS_SIGLIST 0 -_ACEOF - - -fi - - - -echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -if test "${ac_cv_c_const+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -/* FIXME: Include the comments suggested by Paul. */ -#ifndef __cplusplus - /* Ultrix mips cc rejects this. */ - typedef int charset[2]; - const charset x; - /* SunOS 4.1.1 cc rejects this. */ - char const *const *ccp; - char **p; - /* NEC SVR4.0.2 mips cc rejects this. */ - struct point {int x, y;}; - static struct point const zero = {0,0}; - /* AIX XL C 1.02.0.0 rejects this. - It does not let you subtract one const X* pointer from another in - an arm of an if-expression whose if-part is not a constant - expression */ - const char *g = "string"; - ccp = &g + (g ? g-g : 0); - /* HPUX 7.0 cc rejects these. */ - ++ccp; - p = (char**) ccp; - ccp = (char const *const *) p; - { /* SCO 3.2v4 cc rejects this. */ - char *t; - char const *s = 0 ? (char *) 0 : (char const *) 0; - - *t++ = 0; - } - { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ - int x[] = {25, 17}; - const int *foo = &x[0]; - ++foo; - } - { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ - typedef const int *iptr; - iptr p = 0; - ++p; - } - { /* AIX XL C 1.02.0.0 rejects this saying - "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ - struct s { int j; const int *ap[3]; }; - struct s *b; b->j = 5; - } - { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ - const int foo = 10; - } -#endif - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_c_const=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_const=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -echo "${ECHO_T}$ac_cv_c_const" >&6 -if test $ac_cv_c_const = no; then - -cat >>confdefs.h <<\_ACEOF -#define const -_ACEOF - -fi - -#AC_TYPE_SIZE_T -#AC_TYPE_PID_T -echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 -if test "${ac_cv_type_signal+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -#include -#ifdef signal -# undef signal -#endif -#ifdef __cplusplus -extern "C" void (*signal (int, void (*)(int)))(int); -#else -void (*signal ()) (); -#endif - -int -main () -{ -int i; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_type_signal=void -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_type_signal=int -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -echo "${ECHO_T}$ac_cv_type_signal" >&6 - -cat >>confdefs.h <<_ACEOF -#define RETSIGTYPE $ac_cv_type_signal -_ACEOF - - - - - - - - -# until we fix it, leave it disabled -asm_support=no -mmx_support=no -if test "$ac_cv_c_compiler_gnu" = yes; then - - # gcc-3.4 complains about some of our stuff without this - NOSTRICTALIASING="-fno-strict-aliasing" - - x86=0 - case "$host_cpu" in - i[3456]86) x86=1 - ;; - esac - - if test "$host_os" != "linux" -a "$host_os" != "linux-gnu" ; then - x86=0 - fi - - if test $x86 = 1; then - -cat >>confdefs.h <<\_ACEOF -#define ASM_X86 1 -_ACEOF - - asm_support=yes - - echo "$as_me:$LINENO: checking whether gcc supports MMX(tm) inline asm" >&5 -echo $ECHO_N "checking whether gcc supports MMX(tm) inline asm... $ECHO_C" >&6 -if test "${ac_cv_c_inline_mmx+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ -asm ("movq %mm0, %mm1"); - ; - 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_c_inline_mmx=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_c_inline_mmx=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_c_inline_mmx" >&5 -echo "${ECHO_T}$ac_cv_c_inline_mmx" >&6 - - if test "x$ac_cv_c_inline_mmx" = xyes; then - -cat >>confdefs.h <<\_ACEOF -#define ASM_X86_MMX 1 -_ACEOF - - mmx_support=yes - fi - fi -fi - - - -# Extract the first word of "pkg-config", so it can be a program name with args. -set dummy pkg-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_PKGCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$PKGCONFIG"; then - ac_cv_prog_PKGCONFIG="$PKGCONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_PKGCONFIG="pkg-config" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -PKGCONFIG=$ac_cv_prog_PKGCONFIG -if test -n "$PKGCONFIG"; then - echo "$as_me:$LINENO: result: $PKGCONFIG" >&5 -echo "${ECHO_T}$PKGCONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - - - - - - - -INTLIBS="" - -echo "$as_me:$LINENO: checking for gettext" >&5 -echo $ECHO_N "checking for gettext... $ECHO_C" >&6 -if test "${ac_cv_func_gettext+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 gettext to an innocuous variant, in case declares gettext. - For example, HP-UX 11i declares gettimeofday. */ -#define gettext innocuous_gettext - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gettext (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gettext - -/* 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 gettext (); -/* 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_gettext) || defined (__stub___gettext) -choke me -#else -char (*f) () = gettext; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != gettext; - ; - 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_gettext=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_gettext=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_gettext" >&5 -echo "${ECHO_T}$ac_cv_func_gettext" >&6 -if test $ac_cv_func_gettext = yes; then - HAVEGETTEXT="yes" -else - echo "$as_me:$LINENO: checking for gettext in -lintl" >&5 -echo $ECHO_N "checking for gettext in -lintl... $ECHO_C" >&6 -if test "${ac_cv_lib_intl_gettext+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lintl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* 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 gettext (); -int -main () -{ -gettext (); - ; - 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_intl_gettext=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_intl_gettext=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_intl_gettext" >&5 -echo "${ECHO_T}$ac_cv_lib_intl_gettext" >&6 -if test $ac_cv_lib_intl_gettext = yes; then - INTLIBS="-lintl" HAVEGETTEXT="yes" -else - INTLIBS="" -fi - -fi - - -# Extract the first word of "xgettext", so it can be a program name with args. -set dummy xgettext; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_XGETTEXT+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$XGETTEXT"; then - ac_cv_prog_XGETTEXT="$XGETTEXT" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_XGETTEXT="xgettext" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -XGETTEXT=$ac_cv_prog_XGETTEXT -if test -n "$XGETTEXT"; then - echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -echo "${ECHO_T}$XGETTEXT" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - - -if test "$XGETTEXT" != ""; then - if $XGETTEXT --help 2>&1 | grep illegal >/dev/null ; then - echo "xgettext isn't GNU version" - XGETTEXT="" - fi -fi - -if test "$LINGUAS" != ""; then - if test "$XGETTEXT" != "" -a "$HAVEGETTEXT" != ""; then - -cat >>confdefs.h <<\_ACEOF -#define I18N 1 -_ACEOF - - PO="" -# if test "$LINGUAS" = ""; then -# ling=` (cd src/po; /bin/ls *.po) ` -# for l in $ling; do -# lcode=`basename $l .po` -# LINGUAS="$LINGUAS $lcode" -# done -# fi - echo "xgettext and gettext() exist; will build i18n support for $LINGUAS" - else - LINGUAS="" - PO="" - echo "xgettext and libintl.a don't both exist; will not build i18n support" - fi -else - INTLIBS="" - MOFILES="" - WPMOFILES="" - PO="" -fi - - - -supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5" -supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW.Big5" -supported_wings_locales="bg ca cs de fr sk" - -for lang in $LINGUAS; do - ok=0 - for l in $supported_locales; do - if test "$l" = "$lang"; then - ok=1 - break - fi - done - if test "$ok" = 1; then - MOFILES="$MOFILES $lang.mo" - else - echo "Locale $lang is not supported." - fi - ok=0 - for l in $supported_wprefs_locales; do - if test "$l" = "$lang"; then - ok=1 - break - fi - done - if test "$ok" = 1; then - WPMOFILES="$WPMOFILES $lang.mo" - fi - ok=0 - for l in $supported_wings_locales; do - if test "$l" = "$lang"; then - ok=1 - break - fi - done - if test "$ok" = 1; then - WINGSMOFILES="$WINGSMOFILES $lang.mo" - fi -done - - - -case $host_os in - freebsd*) - echo "$as_me:$LINENO: checking for setlocale in -lxpg4" >&5 -echo $ECHO_N "checking for setlocale in -lxpg4... $ECHO_C" >&6 -if test "${ac_cv_lib_xpg4_setlocale+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lxpg4 $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 setlocale (); -int -main () -{ -setlocale (); - ; - 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_xpg4_setlocale=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_xpg4_setlocale=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_xpg4_setlocale" >&5 -echo "${ECHO_T}$ac_cv_lib_xpg4_setlocale" >&6 -if test $ac_cv_lib_xpg4_setlocale = yes; then - LIBS="$LIBS -lxpg4" -fi -;; - *) - ;; -esac - - - - -# Check whether --with-nlsdir or --without-nlsdir was given. -if test "${with_nlsdir+set}" = set; then - withval="$with_nlsdir" - -fi; - - -if test "x$NLSDIR" = "x"; then - if test "x$with_nlsdir" != "x"; then - NLSDIR=$with_nlsdir - else - NLSDIR='$(prefix)/lib/locale' - fi -fi - - - - - - - - - - - - - - - - - -# Check whether --enable-lite or --disable-lite was given. -if test "${enable_lite+set}" = set; then - enableval="$enable_lite" - if test x$enableval = xyes; then - LITE=yes - -cat >>confdefs.h <<\_ACEOF -#define LITE 1 -_ACEOF - - - fi -fi; - - - - -NETLIBS="" - -echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 -if test "${ac_cv_func_connect+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 connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect - -/* 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 connect (); -/* 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_connect) || defined (__stub___connect) -choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != connect; - ; - 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_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 -if test $ac_cv_func_connect = yes; then - : -else - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 connect (); -int -main () -{ -connect (); - ; - 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_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_socket_connect=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_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then - NETLIBS="$NETLIBS -lsocket" -fi - -fi - - -echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 -if test "${ac_cv_func_gethostbyname+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 gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gethostbyname - -/* 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 gethostbyname (); -/* 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_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -char (*f) () = gethostbyname; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != gethostbyname; - ; - 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_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 -if test $ac_cv_func_gethostbyname = yes; then - : -else - echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 gethostbyname (); -int -main () -{ -gethostbyname (); - ; - 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_nsl_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_nsl_gethostbyname=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_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then - NETLIBS="$NETLIBS -lnsl" -fi - -fi - - -echo "$as_me:$LINENO: checking for inet_aton" >&5 -echo $ECHO_N "checking for inet_aton... $ECHO_C" >&6 -if test "${ac_cv_func_inet_aton+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 inet_aton to an innocuous variant, in case declares inet_aton. - For example, HP-UX 11i declares gettimeofday. */ -#define inet_aton innocuous_inet_aton - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char inet_aton (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef inet_aton - -/* 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 inet_aton (); -/* 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_inet_aton) || defined (__stub___inet_aton) -choke me -#else -char (*f) () = inet_aton; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != inet_aton; - ; - 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_inet_aton=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_inet_aton=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_inet_aton" >&5 -echo "${ECHO_T}$ac_cv_func_inet_aton" >&6 -if test $ac_cv_func_inet_aton = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_INET_ATON 1 -_ACEOF - -else - for lib in resolv socket inet bsd; do - as_ac_Lib=`echo "ac_cv_lib_$lib''_inet_aton" | $as_tr_sh` -echo "$as_me:$LINENO: checking for inet_aton in -l$lib" >&5 -echo $ECHO_N "checking for inet_aton in -l$lib... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Lib+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-l$lib $NETLIBS $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 inet_aton (); -int -main () -{ -inet_aton (); - ; - 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 - eval "$as_ac_Lib=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_Lib=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: `eval echo '${'$as_ac_Lib'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 -if test `eval echo '${'$as_ac_Lib'}'` = yes; then - cat >>confdefs.h <<\_ACEOF -#define HAVE_INET_ATON 1 -_ACEOF - - NETLIBS="$NETLIBS -l$lib"; break -fi - - done -fi - - - - - - - -if test "x$ac_path_x_has_been_run" != xyes; then - echo "$as_me:$LINENO: checking for X" >&5 -echo $ECHO_N "checking for X... $ECHO_C" >&6 - -ac_path_x_has_been_run=yes - -# Check whether --with-x or --without-x was given. -if test "${with_x+set}" = set; then - withval="$with_x" - -fi; -# $have_x is `yes', `no', `disabled', or empty when we do not yet know. -if test "x$with_x" = xno; then - # The user explicitly disabled X. - have_x=disabled -else - if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then - # Both variables are already set. - have_x=yes - else - if test "${ac_cv_have_x+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - # One or both of the vars are not set, and there is no cached value. -ac_x_includes=no ac_x_libraries=no -rm -fr conftest.dir -if mkdir conftest.dir; then - cd conftest.dir - # Make sure to not put "make" in the Imakefile rules, since we grep it out. - cat >Imakefile <<'_ACEOF' -acfindx: - @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' -_ACEOF - if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` - # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl; do - if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && - test -f $ac_im_libdir/libX11.$ac_extension; then - ac_im_usrlibdir=$ac_im_libdir; break - fi - done - # Screen out bogus values from the imake configuration. They are - # bogus both because they are the default anyway, and because - # using them would break gcc on systems where it needs fixed includes. - case $ac_im_incroot in - /usr/include) ;; - *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; - esac - case $ac_im_usrlibdir in - /usr/lib | /lib) ;; - *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; - esac - fi - cd .. - rm -fr conftest.dir -fi - -# Standard set of common directories for X headers. -# Check X11 before X11Rn because it is often a symlink to the current release. -ac_x_header_dirs=' -/usr/X11/include -/usr/X11R6/include -/usr/X11R5/include -/usr/X11R4/include - -/usr/include/X11 -/usr/include/X11R6 -/usr/include/X11R5 -/usr/include/X11R4 - -/usr/local/X11/include -/usr/local/X11R6/include -/usr/local/X11R5/include -/usr/local/X11R4/include - -/usr/local/include/X11 -/usr/local/include/X11R6 -/usr/local/include/X11R5 -/usr/local/include/X11R4 - -/usr/X386/include -/usr/x386/include -/usr/XFree86/include/X11 - -/usr/include -/usr/local/include -/usr/unsupported/include -/usr/athena/include -/usr/local/x11r5/include -/usr/lpp/Xamples/include - -/usr/openwin/include -/usr/openwin/share/include' - -if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for a specified header file. - # First, try using that file with no special directory specified. - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - # We can compile using X headers with no special include directory. -ac_x_includes= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Intrinsic.h"; then - ac_x_includes=$ac_dir - break - fi -done -fi -rm -f conftest.err conftest.$ac_ext -fi # $ac_x_includes = no - -if test "$ac_x_libraries" = no; then - # Check for the libraries. - # See if we find them without any special options. - # Don't add to $LIBS permanently. - ac_save_LIBS=$LIBS - LIBS="-lXt $LIBS" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -int -main () -{ -XtMalloc (0) - ; - 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 - LIBS=$ac_save_LIBS -# We can link X programs with no special library path. -ac_x_libraries= -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -LIBS=$ac_save_LIBS -for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` -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 - ac_x_libraries=$ac_dir - break 2 - fi - done -done -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi # $ac_x_libraries = no - -if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then - # Didn't find X anywhere. Cache the known absence of X. - ac_cv_have_x="have_x=no" -else - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" -fi -fi - - fi - eval "$ac_cv_have_x" -fi # $with_x != no - -if test "$have_x" != yes; then - echo "$as_me:$LINENO: result: $have_x" >&5 -echo "${ECHO_T}$have_x" >&6 - no_x=yes -else - # If each of the values was on the command line, it overrides each guess. - test "x$x_includes" = xNONE && x_includes=$ac_x_includes - test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries - # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes \ - ac_x_includes=$x_includes ac_x_libraries=$x_libraries" - # It might be that x_includes is empty (headers are found in the - # standard search path. Then output the corresponding message - ac_out_x_includes=$x_includes - test "x$x_includes" = x && ac_out_x_includes="in standard search path" - echo "$as_me:$LINENO: result: libraries $x_libraries, headers $ac_out_x_includes" >&5 -echo "${ECHO_T}libraries $x_libraries, headers $ac_out_x_includes" >&6 -fi - -fi -if test "$no_x" = yes; then - # Not all programs may use this symbol, but it does not hurt to define it. - -cat >>confdefs.h <<\_ACEOF -#define X_DISPLAY_MISSING 1 -_ACEOF - - X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= -else - if test -n "$x_includes"; then - X_CFLAGS="$X_CFLAGS -I$x_includes" - fi - - # It would also be nice to do this for all -L options, not just this one. - if test -n "$x_libraries"; then - X_LIBS="$X_LIBS -L$x_libraries" - # For Solaris; some versions of Sun CC require a space after -R and - # others require no space. Words are not sufficient . . . . - case `(uname -sr) 2>/dev/null` in - "SunOS 5"*) - echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 -echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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_R_nospace=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_nospace=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_nospace = yes; then - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - X_LIBS="$X_LIBS -R$x_libraries" - else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (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_R_space=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_R_space=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - if test $ac_R_space = yes; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - X_LIBS="$X_LIBS -R $x_libraries" - else - echo "$as_me:$LINENO: result: neither works" >&5 -echo "${ECHO_T}neither works" >&6 - fi - fi - LIBS=$ac_xsave_LIBS - esac - fi - - # Check for system-dependent libraries X programs must link with. - # Do this before checking for the system-independent R6 libraries - # (-lICE), since we may need -lsocket or whatever for X linking. - - if test "$ISC" = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl_s -linet" - else - # Martyn Johnson says this is needed for Ultrix, if the X - # libraries were built with DECnet support. And Karl Berry says - # the Alpha needs dnet_stub (dnet does not exist). - ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - 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 XOpenDisplay (); -int -main () -{ -XOpenDisplay (); - ; - 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 - : -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet $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 dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - 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_dnet_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_dnet_ntoa=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_dnet_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" -fi - - if test $ac_cv_lib_dnet_dnet_ntoa = no; then - echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 -echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ldnet_stub $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 dnet_ntoa (); -int -main () -{ -dnet_ntoa (); - ; - 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_dnet_stub_dnet_ntoa=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_dnet_stub_dnet_ntoa=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_dnet_stub_dnet_ntoa" >&5 -echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 -if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" -fi - - fi -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - LIBS="$ac_xsave_LIBS" - - # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, - # to get the SysV transport functions. - # Chad R. Larson says the Pyramis MIS-ES running DC/OSx (SVR4) - # needs -lnsl. - # The nsl library prevents programs from opening the X display - # on Irix 5.2, according to T.E. Dickey. - # The functions gethostbyname, getservbyname, and inet_addr are - # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - echo "$as_me:$LINENO: checking for gethostbyname" >&5 -echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 -if test "${ac_cv_func_gethostbyname+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 gethostbyname to an innocuous variant, in case declares gethostbyname. - For example, HP-UX 11i declares gettimeofday. */ -#define gethostbyname innocuous_gethostbyname - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char gethostbyname (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef gethostbyname - -/* 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 gethostbyname (); -/* 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_gethostbyname) || defined (__stub___gethostbyname) -choke me -#else -char (*f) () = gethostbyname; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != gethostbyname; - ; - 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_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_gethostbyname=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 - - if test $ac_cv_func_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lnsl $LIBS" -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - -/* 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 gethostbyname (); -int -main () -{ -gethostbyname (); - ; - 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_nsl_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_nsl_gethostbyname=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_nsl_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -if test $ac_cv_lib_nsl_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" -fi - - if test $ac_cv_lib_nsl_gethostbyname = no; then - echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 -echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lbsd $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 gethostbyname (); -int -main () -{ -gethostbyname (); - ; - 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_bsd_gethostbyname=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_bsd_gethostbyname=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_bsd_gethostbyname" >&5 -echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 -if test $ac_cv_lib_bsd_gethostbyname = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" -fi - - fi - fi - - # lieder@skyler.mavd.honeywell.com says without -lsocket, - # socket/setsockopt and other routines are undefined under SCO ODT - # 2.0. But -lsocket is broken on IRIX 5.2 (and is not necessary - # on later versions), says Simon Leinen: it contains gethostby* - # variants that don't use the name server (or something). -lsocket - # must be given before -lnsl if both are needed. We assume that - # if connect needs -lnsl, so does gethostbyname. - echo "$as_me:$LINENO: checking for connect" >&5 -echo $ECHO_N "checking for connect... $ECHO_C" >&6 -if test "${ac_cv_func_connect+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 connect to an innocuous variant, in case declares connect. - For example, HP-UX 11i declares gettimeofday. */ -#define connect innocuous_connect - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char connect (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef connect - -/* 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 connect (); -/* 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_connect) || defined (__stub___connect) -choke me -#else -char (*f) () = connect; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != connect; - ; - 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_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_connect=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 -echo "${ECHO_T}$ac_cv_func_connect" >&6 - - if test $ac_cv_func_connect = no; then - echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 -echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 -if test "${ac_cv_lib_socket_connect+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lsocket $X_EXTRA_LIBS $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 connect (); -int -main () -{ -connect (); - ; - 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_socket_connect=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_socket_connect=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_socket_connect" >&5 -echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 -if test $ac_cv_lib_socket_connect = yes; then - X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" -fi - - fi - - # Guillermo Gomez says -lposix is necessary on A/UX. - echo "$as_me:$LINENO: checking for remove" >&5 -echo $ECHO_N "checking for remove... $ECHO_C" >&6 -if test "${ac_cv_func_remove+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 remove to an innocuous variant, in case declares remove. - For example, HP-UX 11i declares gettimeofday. */ -#define remove innocuous_remove - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char remove (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef remove - -/* 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 remove (); -/* 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_remove) || defined (__stub___remove) -choke me -#else -char (*f) () = remove; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != remove; - ; - 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_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_remove=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 -echo "${ECHO_T}$ac_cv_func_remove" >&6 - - if test $ac_cv_func_remove = no; then - echo "$as_me:$LINENO: checking for remove in -lposix" >&5 -echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 -if test "${ac_cv_lib_posix_remove+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lposix $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 remove (); -int -main () -{ -remove (); - ; - 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_posix_remove=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_posix_remove=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_posix_remove" >&5 -echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 -if test $ac_cv_lib_posix_remove = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" -fi - - fi - - # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - echo "$as_me:$LINENO: checking for shmat" >&5 -echo $ECHO_N "checking for shmat... $ECHO_C" >&6 -if test "${ac_cv_func_shmat+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 shmat to an innocuous variant, in case declares shmat. - For example, HP-UX 11i declares gettimeofday. */ -#define shmat innocuous_shmat - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmat (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shmat - -/* 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 shmat (); -/* 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_shmat) || defined (__stub___shmat) -choke me -#else -char (*f) () = shmat; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shmat; - ; - 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_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shmat=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 -echo "${ECHO_T}$ac_cv_func_shmat" >&6 - - if test $ac_cv_func_shmat = no; then - echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 -echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 -if test "${ac_cv_lib_ipc_shmat+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lipc $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 shmat (); -int -main () -{ -shmat (); - ; - 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_ipc_shmat=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ipc_shmat=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_ipc_shmat" >&5 -echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 -if test $ac_cv_lib_ipc_shmat = yes; then - X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" -fi - - fi - fi - - # Check for libraries that X11R6 Xt/Xaw programs need. - ac_save_LDFLAGS=$LDFLAGS - test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries" - # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to - # check for ICE first), but we must link in the order -lSM -lICE or - # we get undefined symbols. So assume we have SM if we have ICE. - # These have to be linked with before -lX11, unlike the other - # libraries we check for below, so use a different variable. - # John Interrante, Karl Berry - echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 -echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lICE $X_EXTRA_LIBS $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 IceConnectionNumber (); -int -main () -{ -IceConnectionNumber (); - ; - 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_ICE_IceConnectionNumber=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ICE_IceConnectionNumber=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_ICE_IceConnectionNumber" >&5 -echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 -if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then - X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" -fi - - LDFLAGS=$ac_save_LDFLAGS - -fi - - -if test $no_x; then - { { echo "$as_me:$LINENO: error: The path for the X11 files not found! -Make sure you have X and it's headers and libraries (the -devel packages -in Linux) installed." >&5 -echo "$as_me: error: The path for the X11 files not found! -Make sure you have X and it's headers and libraries (the -devel packages -in Linux) installed." >&2;} - { (exit 1); exit 1; }; } -fi - -X_LIBRARY_PATH=$x_libraries - -XCFLAGS="$X_CFLAGS" - -XLFLAGS="$X_LIBS" - -XLIBS="-lX11 $X_EXTRA_LIBS" - - -lib_search_path="$lib_search_path $XLFLAGS" -inc_search_path="$inc_search_path $XCFLAGS" - - - - - - -use_locale=yes -# Check whether --enable-locale or --disable-locale was given. -if test "${enable_locale+set}" = set; then - enableval="$enable_locale" - use_locale=no -fi; - -if test "$use_locale" = yes; then - echo "$as_me:$LINENO: checking for _Xsetlocale in -lX11" >&5 -echo $ECHO_N "checking for _Xsetlocale in -lX11... $ECHO_C" >&6 -if test "${ac_cv_lib_X11__Xsetlocale+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lX11 $XLFLAGS $XLIBS $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 _Xsetlocale (); -int -main () -{ -_Xsetlocale (); - ; - 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_X11__Xsetlocale=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_X11__Xsetlocale=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_X11__Xsetlocale" >&5 -echo "${ECHO_T}$ac_cv_lib_X11__Xsetlocale" >&6 -if test $ac_cv_lib_X11__Xsetlocale = yes; then - -cat >>confdefs.h <<\_ACEOF -#define X_LOCALE 1 -_ACEOF - -fi - -fi - - -echo "$as_me:$LINENO: checking for XInternAtoms in -lX11" >&5 -echo $ECHO_N "checking for XInternAtoms in -lX11... $ECHO_C" >&6 -if test "${ac_cv_lib_X11_XInternAtoms+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lX11 $XLFLAGS $XLIBS $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 XInternAtoms (); -int -main () -{ -XInternAtoms (); - ; - 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_X11_XInternAtoms=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_X11_XInternAtoms=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_X11_XInternAtoms" >&5 -echo "${ECHO_T}$ac_cv_lib_X11_XInternAtoms" >&6 -if test $ac_cv_lib_X11_XInternAtoms = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_XINTERNATOMS 1 -_ACEOF - -fi - - -echo "$as_me:$LINENO: checking for XConvertCase in -lX11" >&5 -echo $ECHO_N "checking for XConvertCase in -lX11... $ECHO_C" >&6 -if test "${ac_cv_lib_X11_XConvertCase+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lX11 $XLFLAGS $XLIBS $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 XConvertCase (); -int -main () -{ -XConvertCase (); - ; - 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_X11_XConvertCase=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_X11_XConvertCase=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_X11_XConvertCase" >&5 -echo "${ECHO_T}$ac_cv_lib_X11_XConvertCase" >&6 -if test $ac_cv_lib_X11_XConvertCase = yes; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_XCONVERTCASE 1 -_ACEOF - -fi - - - -# Check whether --enable-modelock or --disable-modelock was given. -if test "${enable_modelock+set}" = set; then - enableval="$enable_modelock" - -cat >>confdefs.h <<\_ACEOF -#define XKB_MODELOCK 1 -_ACEOF - -fi; - - - -shape=yes -# Check whether --enable-shape or --disable-shape was given. -if test "${enable_shape+set}" = set; then - enableval="$enable_shape" - shape=$enableval -else - shape=yes -fi; - -added_xext=no - -if test "$shape" = yes; then - echo "$as_me:$LINENO: checking for XShapeSelectInput in -lXext" >&5 -echo $ECHO_N "checking for XShapeSelectInput in -lXext... $ECHO_C" >&6 -if test "${ac_cv_lib_Xext_XShapeSelectInput+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $XLFLAGS $XLIBS $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 XShapeSelectInput (); -int -main () -{ -XShapeSelectInput (); - ; - 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_Xext_XShapeSelectInput=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_Xext_XShapeSelectInput=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_Xext_XShapeSelectInput" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XShapeSelectInput" >&6 -if test $ac_cv_lib_Xext_XShapeSelectInput = yes; then - XLIBS="-lXext $XLIBS" - added_xext=yes - -cat >>confdefs.h <<\_ACEOF -#define SHAPE 1 -_ACEOF - -else - shape=no -fi - -fi - - - -xft=yes -XFTLIBS="" - -if test "x$PKGCONFIG" != x -a "`$PKGCONFIG xft; echo $?`" = 0; then - XFTCONFIG="$PKGCONFIG xft" - pkgconfig_xft=yes -else - # Extract the first word of "xft-config", so it can be a program name with args. -set dummy xft-config; ac_word=$2 -echo "$as_me:$LINENO: checking for $ac_word" >&5 -echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_XFTCONFIG+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - if test -n "$XFTCONFIG"; then - ac_cv_prog_XFTCONFIG="$XFTCONFIG" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_XFTCONFIG="xft-config" - echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi -done -done - -fi -fi -XFTCONFIG=$ac_cv_prog_XFTCONFIG -if test -n "$XFTCONFIG"; then - echo "$as_me:$LINENO: result: $XFTCONFIG" >&5 -echo "${ECHO_T}$XFTCONFIG" >&6 -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 -fi - -fi - -echo "$as_me:$LINENO: checking for the Xft2 library" >&5 -echo $ECHO_N "checking for the Xft2 library... $ECHO_C" >&6 - -if test "x$XFTCONFIG" != x; then - XFTLIBS=`$XFTCONFIG --libs` - XFTFLAGS=`$XFTCONFIG --cflags` - echo "$as_me:$LINENO: result: found" >&5 -echo "${ECHO_T}found" >&6 -else - echo "$as_me:$LINENO: result: not found" >&5 -echo "${ECHO_T}not found" >&6 - echo - echo "ERROR!!! libXft2 is not installed or could not be found." - echo " Xft2 is a requirement for building Window Maker." - echo " Please install it (along with fontconfig) before continuing." - echo - exit 1 -fi - -minXFT="2.1.2" -goodxft="no" - - -CPPFLAGS_old="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $XFTFLAGS $inc_search_path" -xft_major_version=`echo $minXFT | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` -xft_minor_version=`echo $minXFT | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'` -xft_micro_version=`echo $minXFT | sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'` -echo "$as_me:$LINENO: checking whether libXft is at least version $minXFT" >&5 -echo $ECHO_N "checking whether libXft is at least version $minXFT... $ECHO_C" >&6 -if test "${ac_cv_lib_xft_version_ok+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. */ -/* Test version of libXft we have */ -#include - -#if !defined(XFT_VERSION) || XFT_VERSION < $xft_major_version*10000 + $xft_minor_version*100 + $xft_micro_version -#error libXft on this system is too old. Consider upgrading to at least $minXFT -#endif - -int -main () -{ - - ; - 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 - eval "ac_cv_lib_xft_version_ok=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "ac_cv_lib_xft_version_ok=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - -if eval "test \"`echo '$ac_cv_lib_xft_version_ok'`\" = yes"; then - echo "$as_me:$LINENO: result: yes" >&5 -echo "${ECHO_T}yes" >&6 - goodxft=yes -else - echo "$as_me:$LINENO: result: no" >&5 -echo "${ECHO_T}no" >&6 - goodxft=no -fi -CPPFLAGS="$CPPFLAGS_old" - - -if test "$goodxft" = no; then - echo - echo "ERROR!!! libXft on this system is an old version." - echo " Please consider upgrading to at least version ${minXFT}." - echo - exit 1 -fi - - - - - -xinerama=no -# Check whether --enable-xinerama or --disable-xinerama was given. -if test "${enable_xinerama+set}" = set; then - enableval="$enable_xinerama" - xinerama=$enableval -else - xinerama=no -fi; - -if test "$xinerama" = yes; then - echo "$as_me:$LINENO: checking for XineramaQueryScreens in -lXinerama" >&5 -echo $ECHO_N "checking for XineramaQueryScreens in -lXinerama... $ECHO_C" >&6 -if test "${ac_cv_lib_Xinerama_XineramaQueryScreens+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXinerama $XLFLAGS $XLIBS $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 XineramaQueryScreens (); -int -main () -{ -XineramaQueryScreens (); - ; - 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_Xinerama_XineramaQueryScreens=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_Xinerama_XineramaQueryScreens=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_Xinerama_XineramaQueryScreens" >&5 -echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaQueryScreens" >&6 -if test $ac_cv_lib_Xinerama_XineramaQueryScreens = yes; then - XLIBS="-lXinerama $XLIBS" - xfxine=yes -else - xfxine=no -fi - - - echo "$as_me:$LINENO: checking for XineramaGetInfo in -lXext" >&5 -echo $ECHO_N "checking for XineramaGetInfo in -lXext... $ECHO_C" >&6 -if test "${ac_cv_lib_Xext_XineramaGetInfo+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $XLFLAGS $XLIBS $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 XineramaGetInfo (); -int -main () -{ -XineramaGetInfo (); - ; - 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_Xext_XineramaGetInfo=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_Xext_XineramaGetInfo=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_Xext_XineramaGetInfo" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XineramaGetInfo" >&6 -if test $ac_cv_lib_Xext_XineramaGetInfo = yes; then - sunxine=yes - -else - sunxine=no -fi - - - if test "$xfxine" = yes; then - xine=1 - fi - - if test "$sunxine" = yes; then - xine=1 - -cat >>confdefs.h <<\_ACEOF -#define SOLARIS_XINERAMA 1 -_ACEOF - - fi - - if test "$xine" = 1; then - -cat >>confdefs.h <<\_ACEOF -#define XINERAMA 1 -_ACEOF - - fi -fi - - - -shm=yes -# Check whether --enable-shm or --disable-shm was given. -if test "${enable_shm+set}" = set; then - enableval="$enable_shm" - shm=$enableval -else - shm=yes -fi; - -if test "$shm" = yes; then - echo "$as_me:$LINENO: checking for XShmAttach in -lXext" >&5 -echo $ECHO_N "checking for XShmAttach in -lXext... $ECHO_C" >&6 -if test "${ac_cv_lib_Xext_XShmAttach+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXext $XLFLAGS $XLIBS $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 XShmAttach (); -int -main () -{ -XShmAttach (); - ; - 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_Xext_XShmAttach=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_Xext_XShmAttach=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_Xext_XShmAttach" >&5 -echo "${ECHO_T}$ac_cv_lib_Xext_XShmAttach" >&6 -if test $ac_cv_lib_Xext_XShmAttach = yes; then - ok=yes -else - ok=no -fi - - - if test "$ok" = yes; then - echo "$as_me:$LINENO: checking for shmget" >&5 -echo $ECHO_N "checking for shmget... $ECHO_C" >&6 -if test "${ac_cv_func_shmget+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 shmget to an innocuous variant, in case declares shmget. - For example, HP-UX 11i declares gettimeofday. */ -#define shmget innocuous_shmget - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char shmget (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef shmget - -/* 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 shmget (); -/* 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_shmget) || defined (__stub___shmget) -choke me -#else -char (*f) () = shmget; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != shmget; - ; - 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_shmget=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_func_shmget=no -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: $ac_cv_func_shmget" >&5 -echo "${ECHO_T}$ac_cv_func_shmget" >&6 -if test $ac_cv_func_shmget = yes; then - ok=yes -else - ok=no -fi - - fi - - if test "$ok" = yes; then - if test "$added_xext" = no; then - XLIBS="-lXext $XLIBS" - fi - -cat >>confdefs.h <<\_ACEOF -#define XSHM 1 -_ACEOF - - fi -fi - - - -# -# -#AC_DEFINE(R6SM) -#AC_SUBST(XSMPLIBS) -# - - - - - - - -xpm=yes -# Check whether --enable-xpm or --disable-xpm was given. -if test "${enable_xpm+set}" = set; then - enableval="$enable_xpm" - xpm=$enableval -else - xpm=yes -fi; - -if test "$xpm" = yes; then - -LDFLAGS_old="$LDFLAGS" -LDFLAGS="$LDFLAGS $lib_search_path" -echo "$as_me:$LINENO: checking for XpmCreatePixmapFromData in -lXpm" >&5 -echo $ECHO_N "checking for XpmCreatePixmapFromData in -lXpm... $ECHO_C" >&6 -if test "${ac_cv_lib_Xpm_XpmCreatePixmapFromData+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lXpm $XLFLAGS $XLIBS $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 XpmCreatePixmapFromData (); -int -main () -{ -XpmCreatePixmapFromData (); - ; - 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_Xpm_XpmCreatePixmapFromData=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_Xpm_XpmCreatePixmapFromData=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_Xpm_XpmCreatePixmapFromData" >&5 -echo "${ECHO_T}$ac_cv_lib_Xpm_XpmCreatePixmapFromData" >&6 -if test $ac_cv_lib_Xpm_XpmCreatePixmapFromData = yes; then - yes=yes -else - no=no -fi - -LDFLAGS="$LDFLAGS_old" - - - if test "x$ac_cv_lib_Xpm_XpmCreatePixmapFromData" = xyes; then - -CPPFLAGS_old="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $inc_search_path" -if test "${ac_cv_header_X11_xpm_h+set}" = set; then - echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 -echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 -if test "${ac_cv_header_X11_xpm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking X11/xpm.h usability" >&5 -echo $ECHO_N "checking X11/xpm.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking X11/xpm.h presence" >&5 -echo $ECHO_N "checking X11/xpm.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: X11/xpm.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: X11/xpm.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: X11/xpm.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: X11/xpm.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: X11/xpm.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: X11/xpm.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: X11/xpm.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: X11/xpm.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for X11/xpm.h" >&5 -echo $ECHO_N "checking for X11/xpm.h... $ECHO_C" >&6 -if test "${ac_cv_header_X11_xpm_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_X11_xpm_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_X11_xpm_h" >&5 -echo "${ECHO_T}$ac_cv_header_X11_xpm_h" >&6 - -fi - - -CPPFLAGS="$CPPFLAGS_old" - - if test "x$ac_cv_header_X11_xpm_h" = xyes; then - GFXLIBS="$GFXLIBS -lXpm" - supported_gfx="XPM" - -cat >>confdefs.h <<\_ACEOF -#define USE_XPM 1 -_ACEOF - - else - supported_gfx="builtin-XPM" - fi - fi -fi - -# for wmlib - -# for test - - - - - - - - -png=yes -# Check whether --enable-png or --disable-png was given. -if test "${enable_png+set}" = set; then - enableval="$enable_png" - png=$enableval -else - png=yes -fi; - - -if test "$png" = yes ; then - -LDFLAGS_old="$LDFLAGS" -LDFLAGS="$LDFLAGS $lib_search_path" -echo "$as_me:$LINENO: checking for png_get_valid in -lpng" >&5 -echo $ECHO_N "checking for png_get_valid in -lpng... $ECHO_C" >&6 -if test "${ac_cv_lib_png_png_get_valid+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lpng -lz -lm $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 png_get_valid (); -int -main () -{ -png_get_valid (); - ; - 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_png_png_get_valid=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_png_png_get_valid=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_png_png_get_valid" >&5 -echo "${ECHO_T}$ac_cv_lib_png_png_get_valid" >&6 -if test $ac_cv_lib_png_png_get_valid = yes; then - yes=yes -else - no=no -fi - -LDFLAGS="$LDFLAGS_old" - - - if test "x$ac_cv_lib_png_png_get_valid" = xyes; then - -CPPFLAGS_old="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $inc_search_path" -if test "${ac_cv_header_png_h+set}" = set; then - echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6 -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking png.h usability" >&5 -echo $ECHO_N "checking png.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking png.h presence" >&5 -echo $ECHO_N "checking png.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: png.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: png.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: png.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: png.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: png.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: png.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: png.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: png.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: png.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for png.h" >&5 -echo $ECHO_N "checking for png.h... $ECHO_C" >&6 -if test "${ac_cv_header_png_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_png_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_png_h" >&5 -echo "${ECHO_T}$ac_cv_header_png_h" >&6 - -fi - - -CPPFLAGS="$CPPFLAGS_old" - - if test "x$ac_cv_header_png_h" = xyes; then - GFXLIBS="$GFXLIBS -lpng -lz" - supported_gfx="$supported_gfx PNG" - -cat >>confdefs.h <<\_ACEOF -#define USE_PNG 1 -_ACEOF - - fi - fi -fi - - -jpeg=yes -ljpeg="" -# Check whether --enable-jpeg or --disable-jpeg was given. -if test "${enable_jpeg+set}" = set; then - enableval="$enable_jpeg" - jpeg=$enableval -else - jpeg=yes -fi; - -if test "$jpeg" = yes; then - -LDFLAGS_old="$LDFLAGS" -LDFLAGS="$LDFLAGS $lib_search_path" -echo "$as_me:$LINENO: checking for jpeg_destroy_compress in -ljpeg" >&5 -echo $ECHO_N "checking for jpeg_destroy_compress in -ljpeg... $ECHO_C" >&6 -if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ljpeg $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 jpeg_destroy_compress (); -int -main () -{ -jpeg_destroy_compress (); - ; - 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_jpeg_jpeg_destroy_compress=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_jpeg_jpeg_destroy_compress=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_jpeg_jpeg_destroy_compress" >&5 -echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6 -if test $ac_cv_lib_jpeg_jpeg_destroy_compress = yes; then - yes=yes -else - no=no -fi - -LDFLAGS="$LDFLAGS_old" - - - if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = xyes; then - - ljpeg="-ljpeg" - - -CPPFLAGS_old="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $inc_search_path" -if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 -if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 -echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 -echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for jpeglib.h" >&5 -echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 -if test "${ac_cv_header_jpeglib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_jpeglib_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 -echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6 - -fi - - -CPPFLAGS="$CPPFLAGS_old" - - if test "x$ac_cv_header_jpeglib_h" = xyes; then - GFXLIBS="$GFXLIBS -ljpeg" - supported_gfx="$supported_gfx JPEG" - -cat >>confdefs.h <<\_ACEOF -#define USE_JPEG 1 -_ACEOF - - fi - fi -fi - - -gif=yes -# Check whether --enable-gif or --disable-gif was given. -if test "${enable_gif+set}" = set; then - enableval="$enable_gif" - gif=$enableval -else - gif=yes -fi; - -if test "$gif" = yes; then - my_libname="" - -LDFLAGS_old="$LDFLAGS" -LDFLAGS="$LDFLAGS $lib_search_path" -echo "$as_me:$LINENO: checking for DGifOpenFileName in -lungif" >&5 -echo $ECHO_N "checking for DGifOpenFileName in -lungif... $ECHO_C" >&6 -if test "${ac_cv_lib_ungif_DGifOpenFileName+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lungif $XLFLAGS $XLIBS $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 DGifOpenFileName (); -int -main () -{ -DGifOpenFileName (); - ; - 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_ungif_DGifOpenFileName=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_ungif_DGifOpenFileName=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_ungif_DGifOpenFileName" >&5 -echo "${ECHO_T}$ac_cv_lib_ungif_DGifOpenFileName" >&6 -if test $ac_cv_lib_ungif_DGifOpenFileName = yes; then - yes=yes -else - no=no -fi - -LDFLAGS="$LDFLAGS_old" - - if test "x$ac_cv_lib_ungif_DGifOpenFileName" = xyes; then - my_libname=-lungif - fi - if test "x$my_libname" = x; then - -LDFLAGS_old="$LDFLAGS" -LDFLAGS="$LDFLAGS $lib_search_path" -echo "$as_me:$LINENO: checking for DGifOpenFileName in -lgif" >&5 -echo $ECHO_N "checking for DGifOpenFileName in -lgif... $ECHO_C" >&6 -if test "${ac_cv_lib_gif_DGifOpenFileName+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-lgif $XLFLAGS $XLIBS $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 DGifOpenFileName (); -int -main () -{ -DGifOpenFileName (); - ; - 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_gif_DGifOpenFileName=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_gif_DGifOpenFileName=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_gif_DGifOpenFileName" >&5 -echo "${ECHO_T}$ac_cv_lib_gif_DGifOpenFileName" >&6 -if test $ac_cv_lib_gif_DGifOpenFileName = yes; then - yes=yes -else - no=no -fi - -LDFLAGS="$LDFLAGS_old" - - if test "x$ac_cv_lib_gif_DGifOpenFileName" = xyes; then - my_libname=-lgif - fi - fi - - if test "$my_libname" != x; then - -CPPFLAGS_old="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $inc_search_path" -if test "${ac_cv_header_gif_lib_h+set}" = set; then - echo "$as_me:$LINENO: checking for gif_lib.h" >&5 -echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6 -if test "${ac_cv_header_gif_lib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_gif_lib_h" >&5 -echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking gif_lib.h usability" >&5 -echo $ECHO_N "checking gif_lib.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking gif_lib.h presence" >&5 -echo $ECHO_N "checking gif_lib.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: gif_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: gif_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: gif_lib.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: gif_lib.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: gif_lib.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: gif_lib.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: gif_lib.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: gif_lib.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: gif_lib.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: gif_lib.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: gif_lib.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: gif_lib.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: gif_lib.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: gif_lib.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: gif_lib.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: gif_lib.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for gif_lib.h" >&5 -echo $ECHO_N "checking for gif_lib.h... $ECHO_C" >&6 -if test "${ac_cv_header_gif_lib_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_gif_lib_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_gif_lib_h" >&5 -echo "${ECHO_T}$ac_cv_header_gif_lib_h" >&6 - -fi - - -CPPFLAGS="$CPPFLAGS_old" - - if test "x$ac_cv_header_gif_lib_h" = xyes; then - GFXLIBS="$GFXLIBS $my_libname" - supported_gfx="$supported_gfx GIF" - -cat >>confdefs.h <<\_ACEOF -#define USE_GIF 1 -_ACEOF - - fi - fi -fi - - - -# Check whether --enable-tiff or --disable-tiff was given. -if test "${enable_tiff+set}" = set; then - enableval="$enable_tiff" - tif=$enableval -else - tif=yes -fi; - -# -# TIFF can optionally have JPEG and/or zlib support. Must find out -# when they are supported so that correct library flags are passed during -# detection and linkage -# -# -# By default use xpm icons if tiff is not found. -ICONEXT="xpm" -# - -if test "$tif" = yes; then - my_libname="" - -LDFLAGS_old="$LDFLAGS" -LDFLAGS="$LDFLAGS $lib_search_path" -echo "$as_me:$LINENO: checking for TIFFGetVersion in -ltiff" >&5 -echo $ECHO_N "checking for TIFFGetVersion in -ltiff... $ECHO_C" >&6 -if test "${ac_cv_lib_tiff_TIFFGetVersion+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff -lm $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 TIFFGetVersion (); -int -main () -{ -TIFFGetVersion (); - ; - 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_tiff_TIFFGetVersion=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_tiff_TIFFGetVersion=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_tiff_TIFFGetVersion" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff_TIFFGetVersion" >&6 -if test $ac_cv_lib_tiff_TIFFGetVersion = yes; then - yes=yes -else - no=no -fi - -LDFLAGS="$LDFLAGS_old" - - if test "x$ac_cv_lib_tiff_TIFFGetVersion" = xyes; then - my_libname="-ltiff" - fi - unset ac_cv_lib_tiff_TIFFGetVersion - if test "x$my_libname" = x; then - -LDFLAGS_old="$LDFLAGS" -LDFLAGS="$LDFLAGS $lib_search_path" -echo "$as_me:$LINENO: checking for TIFFGetVersion in -ltiff" >&5 -echo $ECHO_N "checking for TIFFGetVersion in -ltiff... $ECHO_C" >&6 -if test "${ac_cv_lib_tiff_TIFFGetVersion+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff $ljpeg -lz -lm $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 TIFFGetVersion (); -int -main () -{ -TIFFGetVersion (); - ; - 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_tiff_TIFFGetVersion=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_tiff_TIFFGetVersion=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_tiff_TIFFGetVersion" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff_TIFFGetVersion" >&6 -if test $ac_cv_lib_tiff_TIFFGetVersion = yes; then - yes=yes -else - no=no -fi - -LDFLAGS="$LDFLAGS_old" - - if test "x$ac_cv_lib_tiff_TIFFGetVersion" = xyes; then - my_libname="-ltiff -lz" - fi - fi - - if test "x$my_libname" = x; then - -LDFLAGS_old="$LDFLAGS" -LDFLAGS="$LDFLAGS $lib_search_path" -echo "$as_me:$LINENO: checking for TIFFGetVersion in -ltiff34" >&5 -echo $ECHO_N "checking for TIFFGetVersion in -ltiff34... $ECHO_C" >&6 -if test "${ac_cv_lib_tiff34_TIFFGetVersion+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_check_lib_save_LIBS=$LIBS -LIBS="-ltiff34 $ljpeg -lm $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 TIFFGetVersion (); -int -main () -{ -TIFFGetVersion (); - ; - 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_tiff34_TIFFGetVersion=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_lib_tiff34_TIFFGetVersion=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_tiff34_TIFFGetVersion" >&5 -echo "${ECHO_T}$ac_cv_lib_tiff34_TIFFGetVersion" >&6 -if test $ac_cv_lib_tiff34_TIFFGetVersion = yes; then - yes=yes -else - no=no -fi - -LDFLAGS="$LDFLAGS_old" - - if test "x$ac_cv_lib_tiff34_TIFFGetVersion" = xyes; then - my_libname="-ltiff34" - fi - fi - - - if test "x$my_libname" != x; then - -CPPFLAGS_old="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $inc_search_path" -if test "${ac_cv_header_tiffio_h+set}" = set; then - echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 -if test "${ac_cv_header_tiffio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking tiffio.h usability" >&5 -echo $ECHO_N "checking tiffio.h usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking tiffio.h presence" >&5 -echo $ECHO_N "checking tiffio.h presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: tiffio.h: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: tiffio.h: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: tiffio.h: present but cannot be compiled" >&5 -echo "$as_me: WARNING: tiffio.h: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: tiffio.h: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: tiffio.h: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: tiffio.h: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: tiffio.h: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: tiffio.h: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: tiffio.h: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for tiffio.h" >&5 -echo $ECHO_N "checking for tiffio.h... $ECHO_C" >&6 -if test "${ac_cv_header_tiffio_h+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_header_tiffio_h=$ac_header_preproc -fi -echo "$as_me:$LINENO: result: $ac_cv_header_tiffio_h" >&5 -echo "${ECHO_T}$ac_cv_header_tiffio_h" >&6 - -fi - - -CPPFLAGS="$CPPFLAGS_old" - - if test "x$ac_cv_header_tiffio_h" = xyes; then - GFXLIBS="$my_libname $GFXLIBS" - ICONEXT="tiff" - supported_gfx="$supported_gfx TIFF" - -cat >>confdefs.h <<\_ACEOF -#define USE_TIFF 1 -_ACEOF - - fi - fi -fi - -LIBRARY_SEARCH_PATH="$lib_search_path" -HEADER_SEARCH_PATH="$inc_search_path" - - - - - - - - - - - - -for ac_header in stdlib.h -do -as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -else - # Is the header compilable? -echo "$as_me:$LINENO: checking $ac_header usability" >&5 -echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -$ac_includes_default -#include <$ac_header> -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { 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_objext' - { (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_header_compiler=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_header_compiler=no -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -echo "${ECHO_T}$ac_header_compiler" >&6 - -# Is the header present? -echo "$as_me:$LINENO: checking $ac_header presence" >&5 -echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -#include <$ac_header> -_ACEOF -if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 - (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } >/dev/null; then - if test -s conftest.err; then - ac_cpp_err=$ac_c_preproc_warn_flag - ac_cpp_err=$ac_cpp_err$ac_c_werror_flag - else - ac_cpp_err= - fi -else - ac_cpp_err=yes -fi -if test -z "$ac_cpp_err"; then - ac_header_preproc=yes -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -echo "${ECHO_T}$ac_header_preproc" >&6 - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in - yes:no: ) - { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} - ac_header_preproc=yes - ;; - no:yes:* ) - { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} - { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} - ( - cat <<\_ASBOX -## ------------------------------------------ ## -## Report this to the AC_PACKAGE_NAME lists. ## -## ------------------------------------------ ## -_ASBOX - ) | - sed "s/^/$as_me: WARNING: /" >&2 - ;; -esac -echo "$as_me:$LINENO: checking for $ac_header" >&5 -echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -if eval "test \"\${$as_ac_Header+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - eval "$as_ac_Header=\$ac_header_preproc" -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 - -fi -if test `eval echo '${'$as_ac_Header'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - -# AC_PREFIX_PROGRAM(wmaker) - - -# Check whether --with-pixmapdir or --without-pixmapdir was given. -if test "${with_pixmapdir+set}" = set; then - withval="$with_pixmapdir" - -fi; - -if test "x$with_pixmapdir" != "x"; then - pixmapdir=$with_pixmapdir -else - pixmapdir=`eval echo ${datadir}/pixmaps` -fi - - -cat >>confdefs.h <<_ACEOF -#define PIXMAPDIR "$pixmapdir" -_ACEOF - - -pkgdatadir=`eval echo $datadir` - -cat >>confdefs.h <<_ACEOF -#define PKGDATADIR "$pkgdatadir/WindowMaker" -_ACEOF - - -_sysconfdir=`eval echo $sysconfdir` - -cat >>confdefs.h <<_ACEOF -#define SYSCONFDIR "$_sysconfdir" -_ACEOF - - - - -appspath="" - - -# Check whether --with-appspath or --without-appspath was given. -if test "${with_appspath+set}" = set; then - withval="$with_appspath" - appspath=$withval -fi; - -if test "x$appspath" = "x"; then - gnustepdir='${prefix}/GNUstep' - - if test "x$GNUSTEP_LOCAL_ROOT" != "x" ; then - gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e "s|^${prefix}|prefix|"` - gnustepdir=`echo $gnustepdir | sed -e 's|^prefix|${prefix}|'` - fi - - with_appspath=$gnustepdir/Applications -fi - -wprefsdir=$with_appspath/WPrefs.app - - - - -# Check whether --enable-usermenu or --disable-usermenu was given. -if test "${enable_usermenu+set}" = set; then - enableval="$enable_usermenu" - if test "$enableval" = yes; then - -cat >>confdefs.h <<\_ACEOF -#define USER_MENU 1 -_ACEOF - -fi - -fi; - - - - - ac_config_files="$ac_config_files Makefile po/Makefile util/Makefile test/Makefile WINGs/Makefile WINGs/WINGs/Makefile WINGs/Documentation/Makefile WINGs/Examples/Makefile WINGs/Resources/Makefile WINGs/Tests/Makefile WINGs/Extras/Makefile WINGs/po/Makefile wmlib/Makefile wrlib/Makefile src/Makefile src/wconfig.h doc/Makefile doc/sk/Makefile WindowMaker/Makefile WindowMaker/Backgrounds/Makefile WindowMaker/Defaults/Makefile WindowMaker/IconSets/Makefile WindowMaker/Icons/Makefile WindowMaker/Pixmaps/Makefile WindowMaker/Styles/Makefile WindowMaker/Themes/Makefile WPrefs.app/Makefile WPrefs.app/tiff/Makefile WPrefs.app/xpm/Makefile WPrefs.app/po/Makefile contrib/Makefile contrib/WindowMaker.spec" -cat >confcache <<\_ACEOF -# This file is a shell script that caches the results of configure -# tests run on this system so they can be shared between configure -# scripts and configure runs, see configure's option --config-cache. -# It is not useful on other systems. If it contains results you don't -# want to keep, you may remove or edit it. -# -# config.status only pays attention to the cache file if you give it -# the --recheck option to rerun configure. -# -# `ac_cv_env_foo' variables (set or unset) will be overridden when -# loading this file, other *unset* `ac_cv_foo' will be assigned the -# following values. - -_ACEOF - -# The following way of writing the cache mishandles newlines in values, -# but we know of no workaround that is simple, portable, and efficient. -# So, don't put newlines in cache variables' values. -# Ultrix sh set writes to stderr and can't be redirected directly, -# and sets the high bit in the cache file unless we assign to the vars. -{ - (set) 2>&1 | - case `(ac_space=' '; set | grep ac_space) 2>&1` in - *ac_space=\ *) - # `set' does not quote correctly, so add quotes (double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \). - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n \ - "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" - ;; - esac; -} | - sed ' - t clear - : clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end - /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - : end' >>confcache -if diff $cache_file confcache >/dev/null 2>&1; then :; else - if test -w $cache_file; then - test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" - cat confcache >$cache_file - else - echo "not updating unwritable cache $cache_file" - fi -fi -rm -f confcache - -test "x$prefix" = xNONE && prefix=$ac_default_prefix -# Let make expand exec_prefix. -test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/; -s/:*\${srcdir}:*/:/; -s/:*@srcdir@:*/:/; -s/^\([^=]*=[ ]*\):*/\1/; -s/:*$//; -s/^[^=]*=[ ]*$//; -}' -fi - -DEFS=-DHAVE_CONFIG_H - -ac_libobjs= -ac_ltlibobjs= -for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. - ac_i=`echo "$ac_i" | - sed 's/\$U\././;s/\.o$//;s/\.obj$//'` - # 2. Add them. - ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" - ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -done -LIBOBJS=$ac_libobjs - -LTLIBOBJS=$ac_ltlibobjs - - - -: ${CONFIG_STATUS=./config.status} -ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -echo "$as_me: creating $CONFIG_STATUS" >&6;} -cat >$CONFIG_STATUS <<_ACEOF -#! $SHELL -# Generated by $as_me. -# Run this file to recreate the current configuration. -# Compiler output produced by configure, useful for debugging -# configure, is in config.log if it exists. - -debug=false -ac_cs_recheck=false -ac_cs_silent=false -SHELL=\${CONFIG_SHELL-$SHELL} -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -## --------------------- ## -## M4sh Initialization. ## -## --------------------- ## - -# Be Bourne compatible -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then - emulate sh - NULLCMD=: - # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' -elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then - set -o posix -fi -DUALCASE=1; export DUALCASE # for MKS sh - -# Support unset when possible. -if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then - as_unset=unset -else - as_unset=false -fi - - -# Work around bugs in pre-3.0 UWIN ksh. -$as_unset ENV MAIL MAILPATH -PS1='$ ' -PS2='> ' -PS4='+ ' - -# NLS nuisances. -for as_var in \ - LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ - LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ - LC_TELEPHONE LC_TIME -do - if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then - eval $as_var=C; export $as_var - else - $as_unset $as_var - fi -done - -# Required to use basename. -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then - as_basename=basename -else - as_basename=false -fi - - -# Name of the executable. -as_me=`$as_basename "$0" || -$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)$' \| \ - . : '\(.\)' 2>/dev/null || -echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } - /^X\/\(\/\/\)$/{ s//\1/; q; } - /^X\/\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - - -# PATH needs CR, and LINENO needs CR and PATH. -# Avoid depending upon Character Ranges. -as_cr_letters='abcdefghijklmnopqrstuvwxyz' -as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -as_cr_Letters=$as_cr_letters$as_cr_LETTERS -as_cr_digits='0123456789' -as_cr_alnum=$as_cr_Letters$as_cr_digits - -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - echo "#! /bin/sh" >conf$$.sh - echo "exit 0" >>conf$$.sh - chmod +x conf$$.sh - if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then - PATH_SEPARATOR=';' - else - PATH_SEPARATOR=: - fi - rm -f conf$$.sh -fi - - - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" || { - # Find who we are. Look in the path if we contain no path at all - # relative or not. - case $0 in - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -done - - ;; - esac - # We did not find ourselves, most probably we were run as `sh COMMAND' - # in which case we are not to be found in the path. - if test "x$as_myself" = x; then - as_myself=$0 - fi - if test ! -f "$as_myself"; then - { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} - { (exit 1); exit 1; }; } - fi - case $CONFIG_SHELL in - '') - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for as_base in sh bash ksh sh5; do - case $as_dir in - /*) - if ("$as_dir/$as_base" -c ' - as_lineno_1=$LINENO - as_lineno_2=$LINENO - as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` - test "x$as_lineno_1" != "x$as_lineno_2" && - test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then - $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } - $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } - CONFIG_SHELL=$as_dir/$as_base - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$0" ${1+"$@"} - fi;; - esac - done -done -;; - esac - - # Create $as_me.lineno as a copy of $as_myself, but with $LINENO - # uniformly replaced by the line number. The first 'sed' inserts a - # line-number line before each line; the second 'sed' does the real - # work. The second script uses 'N' to pair each line-number line - # with the numbered line, and appends trailing '-' during - # substitution so that $LINENO is not a special case at line end. - # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the - # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) - sed '=' <$as_myself | - sed ' - N - s,$,-, - : loop - s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, - t loop - s,-$,, - s,^['$as_cr_digits']*\n,, - ' >$as_me.lineno && - chmod +x $as_me.lineno || - { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} - { (exit 1); exit 1; }; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensible to this). - . ./$as_me.lineno - # Exit status is that of the last command. - exit -} - - -case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in - *c*,-n*) ECHO_N= ECHO_C=' -' ECHO_T=' ' ;; - *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; - *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -esac - -if expr a : '\(a\)' >/dev/null 2>&1; then - as_expr=expr -else - as_expr=false -fi - -rm -f conf$$ conf$$.exe conf$$.file -echo >conf$$.file -if ln -s conf$$.file conf$$ 2>/dev/null; then - # We could just check for DJGPP; but this test a) works b) is more generic - # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). - if test -f conf$$.exe; then - # Don't use ln at all; we don't have any links - as_ln_s='cp -p' - else - as_ln_s='ln -s' - fi -elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln -else - as_ln_s='cp -p' -fi -rm -f conf$$ conf$$.exe conf$$.file - -if mkdir -p . 2>/dev/null; then - as_mkdir_p=: -else - test -d ./-p && rmdir ./-p - as_mkdir_p=false -fi - -as_executable_p="test -f" - -# Sed expression to map a string onto a valid CPP name. -as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" - -# Sed expression to map a string onto a valid variable name. -as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - -# IFS -# We need space, tab and new line, in precisely that order. -as_nl=' -' -IFS=" $as_nl" - -# CDPATH. -$as_unset CDPATH - -exec 6>&1 - -# Open the log real soon, to keep \$[0] and so on meaningful, and to -# report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. Logging --version etc. is OK. -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX -} >&5 -cat >&5 <<_CSEOF - -This file was extended by $as_me, which was -generated by GNU Autoconf 2.59. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS - CONFIG_LINKS = $CONFIG_LINKS - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - -_CSEOF -echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -echo >&5 -_ACEOF - -# Files that config.status was made for. -if test -n "$ac_config_files"; then - echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_headers"; then - echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_links"; then - echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -fi - -if test -n "$ac_config_commands"; then - echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -fi - -cat >>$CONFIG_STATUS <<\_ACEOF - -ac_cs_usage="\ -\`$as_me' instantiates files from templates according to the -current configuration. - -Usage: $0 [OPTIONS] [FILE]... - - -h, --help print this help, then exit - -V, --version print version number, then exit - -q, --quiet do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE - --header=FILE[:TEMPLATE] - instantiate the configuration header FILE - -Configuration files: -$config_files - -Configuration headers: -$config_headers - -Configuration commands: -$config_commands - -Report bugs to ." -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -ac_cs_version="\\ -config.status -configured by $0, generated by GNU Autoconf 2.59, - with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" - -Copyright (C) 2003 Free Software Foundation, Inc. -This config.status script is free software; the Free Software Foundation -gives unlimited permission to copy, distribute and modify it." -srcdir=$srcdir -INSTALL="$INSTALL" -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF -# If no file are specified by the user, then we need to provide default -# value. By we need to know if files were specified by the user. -ac_need_defaults=: -while test $# != 0 -do - case $1 in - --*=*) - ac_option=`expr "x$1" : 'x\([^=]*\)='` - ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` - ac_shift=: - ;; - -*) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; - *) # This is not an option, so the user has probably given explicit - # arguments. - ac_option=$1 - ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; - --version | --vers* | -V ) - echo "$ac_cs_version"; exit 0 ;; - --he | --h) - # Conflict between --help and --header - { { echo "$as_me:$LINENO: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: ambiguous option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; };; - --help | --hel | -h ) - echo "$ac_cs_usage"; exit 0 ;; - --debug | --d* | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift - CONFIG_FILES="$CONFIG_FILES $ac_optarg" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift - CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" - ac_need_defaults=false;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. - -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&5 -echo "$as_me: error: unrecognized option: $1 -Try \`$0 --help' for more information." >&2;} - { (exit 1); exit 1; }; } ;; - - *) ac_config_targets="$ac_config_targets $1" ;; - - esac - shift -done - -ac_configure_extra_args= - -if $ac_cs_silent; then - exec 6>/dev/null - ac_configure_extra_args="$ac_configure_extra_args --silent" -fi - -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF -if \$ac_cs_recheck; then - echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 - exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -fi - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF -# -# INIT-COMMANDS section. -# - - - -_ACEOF - - - -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_config_target in $ac_config_targets -do - case "$ac_config_target" in - # Handling of arguments. - "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; - "po/Makefile" ) CONFIG_FILES="$CONFIG_FILES po/Makefile" ;; - "util/Makefile" ) CONFIG_FILES="$CONFIG_FILES util/Makefile" ;; - "test/Makefile" ) CONFIG_FILES="$CONFIG_FILES test/Makefile" ;; - "WINGs/Makefile" ) CONFIG_FILES="$CONFIG_FILES WINGs/Makefile" ;; - "WINGs/WINGs/Makefile" ) CONFIG_FILES="$CONFIG_FILES WINGs/WINGs/Makefile" ;; - "WINGs/Documentation/Makefile" ) CONFIG_FILES="$CONFIG_FILES WINGs/Documentation/Makefile" ;; - "WINGs/Examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES WINGs/Examples/Makefile" ;; - "WINGs/Resources/Makefile" ) CONFIG_FILES="$CONFIG_FILES WINGs/Resources/Makefile" ;; - "WINGs/Tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES WINGs/Tests/Makefile" ;; - "WINGs/Extras/Makefile" ) CONFIG_FILES="$CONFIG_FILES WINGs/Extras/Makefile" ;; - "WINGs/po/Makefile" ) CONFIG_FILES="$CONFIG_FILES WINGs/po/Makefile" ;; - "wmlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES wmlib/Makefile" ;; - "wrlib/Makefile" ) CONFIG_FILES="$CONFIG_FILES wrlib/Makefile" ;; - "src/Makefile" ) CONFIG_FILES="$CONFIG_FILES src/Makefile" ;; - "src/wconfig.h" ) CONFIG_FILES="$CONFIG_FILES src/wconfig.h" ;; - "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;; - "doc/sk/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/sk/Makefile" ;; - "WindowMaker/Makefile" ) CONFIG_FILES="$CONFIG_FILES WindowMaker/Makefile" ;; - "WindowMaker/Backgrounds/Makefile" ) CONFIG_FILES="$CONFIG_FILES WindowMaker/Backgrounds/Makefile" ;; - "WindowMaker/Defaults/Makefile" ) CONFIG_FILES="$CONFIG_FILES WindowMaker/Defaults/Makefile" ;; - "WindowMaker/IconSets/Makefile" ) CONFIG_FILES="$CONFIG_FILES WindowMaker/IconSets/Makefile" ;; - "WindowMaker/Icons/Makefile" ) CONFIG_FILES="$CONFIG_FILES WindowMaker/Icons/Makefile" ;; - "WindowMaker/Pixmaps/Makefile" ) CONFIG_FILES="$CONFIG_FILES WindowMaker/Pixmaps/Makefile" ;; - "WindowMaker/Styles/Makefile" ) CONFIG_FILES="$CONFIG_FILES WindowMaker/Styles/Makefile" ;; - "WindowMaker/Themes/Makefile" ) CONFIG_FILES="$CONFIG_FILES WindowMaker/Themes/Makefile" ;; - "WPrefs.app/Makefile" ) CONFIG_FILES="$CONFIG_FILES WPrefs.app/Makefile" ;; - "WPrefs.app/tiff/Makefile" ) CONFIG_FILES="$CONFIG_FILES WPrefs.app/tiff/Makefile" ;; - "WPrefs.app/xpm/Makefile" ) CONFIG_FILES="$CONFIG_FILES WPrefs.app/xpm/Makefile" ;; - "WPrefs.app/po/Makefile" ) CONFIG_FILES="$CONFIG_FILES WPrefs.app/po/Makefile" ;; - "contrib/Makefile" ) CONFIG_FILES="$CONFIG_FILES contrib/Makefile" ;; - "contrib/WindowMaker.spec" ) CONFIG_FILES="$CONFIG_FILES contrib/WindowMaker.spec" ;; - "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; - "src/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS src/config.h" ;; - *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -echo "$as_me: error: invalid argument: $ac_config_target" >&2;} - { (exit 1); exit 1; }; };; - esac -done - -# If the user did not use the arguments to specify the items to instantiate, -# then the envvar interface is used. Set only those that are not. -# We use the long form for the default assignment because of an extremely -# bizarre bug on SunOS 4.1.3. -if $ac_need_defaults; then - test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files - test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers - test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -fi - -# Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason to put it here, and in addition, -# creating and moving files from /tmp can sometimes cause problems. -# Create a temporary directory, and hook for its removal unless debugging. -$debug || -{ - trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 - trap '{ (exit 1); exit 1; }' 1 2 13 15 -} - -# Create a (secure) tmp directory for tmp files. - -{ - tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" -} || -{ - tmp=./confstat$$-$RANDOM - (umask 077 && mkdir $tmp) -} || -{ - echo "$me: cannot create a temporary directory in ." >&2 - { (exit 1); exit 1; } -} - -_ACEOF - -cat >>$CONFIG_STATUS <<_ACEOF - -# -# CONFIG_FILES section. -# - -# No need to generate the scripts if there are no CONFIG_FILES. -# This happens for instance when ./config.status config.h -if test -n "\$CONFIG_FILES"; then - # Protect against being on the right side of a sed subst in config.status. - sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; - s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -s,@SHELL@,$SHELL,;t t -s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -s,@exec_prefix@,$exec_prefix,;t t -s,@prefix@,$prefix,;t t -s,@program_transform_name@,$program_transform_name,;t t -s,@bindir@,$bindir,;t t -s,@sbindir@,$sbindir,;t t -s,@libexecdir@,$libexecdir,;t t -s,@datadir@,$datadir,;t t -s,@sysconfdir@,$sysconfdir,;t t -s,@sharedstatedir@,$sharedstatedir,;t t -s,@localstatedir@,$localstatedir,;t t -s,@libdir@,$libdir,;t t -s,@includedir@,$includedir,;t t -s,@oldincludedir@,$oldincludedir,;t t -s,@infodir@,$infodir,;t t -s,@mandir@,$mandir,;t t -s,@build_alias@,$build_alias,;t t -s,@host_alias@,$host_alias,;t t -s,@target_alias@,$target_alias,;t t -s,@DEFS@,$DEFS,;t t -s,@ECHO_C@,$ECHO_C,;t t -s,@ECHO_N@,$ECHO_N,;t t -s,@ECHO_T@,$ECHO_T,;t t -s,@LIBS@,$LIBS,;t t -s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -s,@INSTALL_DATA@,$INSTALL_DATA,;t t -s,@PACKAGE@,$PACKAGE,;t t -s,@VERSION@,$VERSION,;t t -s,@ACLOCAL@,$ACLOCAL,;t t -s,@AUTOCONF@,$AUTOCONF,;t t -s,@AUTOMAKE@,$AUTOMAKE,;t t -s,@AUTOHEADER@,$AUTOHEADER,;t t -s,@MAKEINFO@,$MAKEINFO,;t t -s,@SET_MAKE@,$SET_MAKE,;t t -s,@build@,$build,;t t -s,@build_cpu@,$build_cpu,;t t -s,@build_vendor@,$build_vendor,;t t -s,@build_os@,$build_os,;t t -s,@host@,$host,;t t -s,@host_cpu@,$host_cpu,;t t -s,@host_vendor@,$host_vendor,;t t -s,@host_os@,$host_os,;t t -s,@CC@,$CC,;t t -s,@CFLAGS@,$CFLAGS,;t t -s,@LDFLAGS@,$LDFLAGS,;t t -s,@CPPFLAGS@,$CPPFLAGS,;t t -s,@ac_ct_CC@,$ac_ct_CC,;t t -s,@EXEEXT@,$EXEEXT,;t t -s,@OBJEXT@,$OBJEXT,;t t -s,@EGREP@,$EGREP,;t t -s,@LN_S@,$LN_S,;t t -s,@ECHO@,$ECHO,;t t -s,@AR@,$AR,;t t -s,@ac_ct_AR@,$ac_ct_AR,;t t -s,@RANLIB@,$RANLIB,;t t -s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -s,@STRIP@,$STRIP,;t t -s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t -s,@CPP@,$CPP,;t t -s,@CXX@,$CXX,;t t -s,@CXXFLAGS@,$CXXFLAGS,;t t -s,@ac_ct_CXX@,$ac_ct_CXX,;t t -s,@CXXCPP@,$CXXCPP,;t t -s,@F77@,$F77,;t t -s,@FFLAGS@,$FFLAGS,;t t -s,@ac_ct_F77@,$ac_ct_F77,;t t -s,@LIBTOOL@,$LIBTOOL,;t t -s,@ALLOCA@,$ALLOCA,;t t -s,@CPP_PATH@,$CPP_PATH,;t t -s,@NOSTRICTALIASING@,$NOSTRICTALIASING,;t t -s,@PKGCONFIG@,$PKGCONFIG,;t t -s,@XGETTEXT@,$XGETTEXT,;t t -s,@DLLIBS@,$DLLIBS,;t t -s,@INTLIBS@,$INTLIBS,;t t -s,@NLSDIR@,$NLSDIR,;t t -s,@MOFILES@,$MOFILES,;t t -s,@WPMOFILES@,$WPMOFILES,;t t -s,@WINGSMOFILES@,$WINGSMOFILES,;t t -s,@supported_locales@,$supported_locales,;t t -s,@LITE@,$LITE,;t t -s,@NETLIBS@,$NETLIBS,;t t -s,@X_CFLAGS@,$X_CFLAGS,;t t -s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t -s,@X_LIBS@,$X_LIBS,;t t -s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t -s,@X_LIBRARY_PATH@,$X_LIBRARY_PATH,;t t -s,@XFTCONFIG@,$XFTCONFIG,;t t -s,@XFTFLAGS@,$XFTFLAGS,;t t -s,@XFTLIBS@,$XFTLIBS,;t t -s,@XCFLAGS@,$XCFLAGS,;t t -s,@XLFLAGS@,$XLFLAGS,;t t -s,@XLIBS@,$XLIBS,;t t -s,@LIBRARY_SEARCH_PATH@,$LIBRARY_SEARCH_PATH,;t t -s,@HEADER_SEARCH_PATH@,$HEADER_SEARCH_PATH,;t t -s,@GFXLIBS@,$GFXLIBS,;t t -s,@ICONEXT@,$ICONEXT,;t t -s,@wprefsdir@,$wprefsdir,;t t -s,@LIBOBJS@,$LIBOBJS,;t t -s,@LTLIBOBJS@,$LTLIBOBJS,;t t -CEOF - -_ACEOF - - cat >>$CONFIG_STATUS <<\_ACEOF - # Split the substitutions into bite-sized pieces for seds with - # small command number limits, like on Digital OSF/1 and HP-UX. - ac_max_sed_lines=48 - ac_sed_frag=1 # Number of current file. - ac_beg=1 # First line for current file. - ac_end=$ac_max_sed_lines # Line after last line for current file. - ac_more_lines=: - ac_sed_cmds= - while $ac_more_lines; do - if test $ac_beg -gt 1; then - sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - else - sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag - fi - if test ! -s $tmp/subs.frag; then - ac_more_lines=false - else - # The purpose of the label and of the branching condition is to - # speed up the sed processing (if there are no `@' at all, there - # is no need to browse any of the substitutions). - # These are the two extra sed commands mentioned above. - (echo ':t - /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed - if test -z "$ac_sed_cmds"; then - ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" - else - ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" - fi - ac_sed_frag=`expr $ac_sed_frag + 1` - ac_beg=$ac_end - ac_end=`expr $ac_end + $ac_max_sed_lines` - fi - done - if test -z "$ac_sed_cmds"; then - ac_sed_cmds=cat - fi -fi # test -n "$CONFIG_FILES" - -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - - case $INSTALL in - [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; - *) ac_INSTALL=$ac_top_builddir$INSTALL ;; - esac - - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - configure_input= - else - configure_input="$ac_file. " - fi - configure_input=$configure_input"Generated from `echo $ac_file_in | - sed 's,.*/,,'` by configure." - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - - if test x"$ac_file" != x-; then - { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - rm -f "$ac_file" - fi -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF - sed "$ac_vpsub -$extrasub -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF -:t -/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s,@configure_input@,$configure_input,;t t -s,@srcdir@,$ac_srcdir,;t t -s,@abs_srcdir@,$ac_abs_srcdir,;t t -s,@top_srcdir@,$ac_top_srcdir,;t t -s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -s,@builddir@,$ac_builddir,;t t -s,@abs_builddir@,$ac_abs_builddir,;t t -s,@top_builddir@,$ac_top_builddir,;t t -s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -s,@INSTALL@,$ac_INSTALL,;t t -" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out - rm -f $tmp/stdin - if test x"$ac_file" != x-; then - mv $tmp/out $ac_file - else - cat $tmp/out - rm -f $tmp/out - fi - -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_HEADER section. -# - -# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -# NAME is the cpp macro being defined and VALUE is the value it is being given. -# -# ac_d sets the value in "#define NAME VALUE" lines. -ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -ac_dB='[ ].*$,\1#\2' -ac_dC=' ' -ac_dD=',;t' -# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -ac_uB='$,\1#\2define\3' -ac_uC=' ' -ac_uD=',;t' - -for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue - # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". - case $ac_file in - - | *:- | *:-:* ) # input from stdin - cat >$tmp/stdin - ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; - * ) ac_file_in=$ac_file.in ;; - esac - - test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -echo "$as_me: creating $ac_file" >&6;} - - # First look for the input files in the build tree, otherwise in the - # src tree. - ac_file_inputs=`IFS=: - for f in $ac_file_in; do - case $f in - -) echo $tmp/stdin ;; - [\\/$]*) - # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - # Do quote $f, to prevent DOS paths from being IFS'd. - echo "$f";; - *) # Relative - if test -f "$f"; then - # Build tree - echo "$f" - elif test -f "$srcdir/$f"; then - # Source tree - echo "$srcdir/$f" - else - # /dev/null tree - { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -echo "$as_me: error: cannot find input file: $f" >&2;} - { (exit 1); exit 1; }; } - fi;; - esac - done` || { (exit 1); exit 1; } - # Remove the trailing spaces. - sed 's/[ ]*$//' $ac_file_inputs >$tmp/in - -_ACEOF - -# Transform confdefs.h into two sed scripts, `conftest.defines' and -# `conftest.undefs', that substitutes the proper values into -# config.h.in to produce config.h. The first handles `#define' -# templates, and the second `#undef' templates. -# And first: Protect against being on the right side of a sed subst in -# config.status. Protect against being in an unquoted here document -# in config.status. -rm -f conftest.defines conftest.undefs -# Using a here document instead of a string reduces the quoting nightmare. -# Putting comments in sed scripts is not portable. -# -# `end' is used to avoid that the second main sed command (meant for -# 0-ary CPP macros) applies to n-ary macro definitions. -# See the Autoconf documentation for `clear'. -cat >confdef2sed.sed <<\_ACEOF -s/[\\&,]/\\&/g -s,[\\$`],\\&,g -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -t end -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -: end -_ACEOF -# If some macros were called several times there might be several times -# the same #defines, which is useless. Nevertheless, we may not want to -# sort them, since we want the *last* AC-DEFINE to be honored. -uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -rm -f confdef2sed.sed - -# This sed command replaces #undef with comments. This is necessary, for -# example, in the case of _POSIX_SOURCE, which is predefined and required -# on some systems where configure will not decide to define it. -cat >>conftest.undefs <<\_ACEOF -s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -_ACEOF - -# Break up conftest.defines because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -echo ' :' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.defines >/dev/null -do - # Write a limited-size here document to $tmp/defines.sed. - echo ' cat >$tmp/defines.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#define' lines. - echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/defines.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail - rm -f conftest.defines - mv conftest.tail conftest.defines -done -rm -f conftest.defines -echo ' fi # grep' >>$CONFIG_STATUS -echo >>$CONFIG_STATUS - -# Break up conftest.undefs because some shells have a limit on the size -# of here documents, and old seds have small limits too (100 cmds). -echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -rm -f conftest.tail -while grep . conftest.undefs >/dev/null -do - # Write a limited-size here document to $tmp/undefs.sed. - echo ' cat >$tmp/undefs.sed <>$CONFIG_STATUS - # Speed up: don't consider the non `#undef' - echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS - # Work around the forget-to-reset-the-flag bug. - echo 't clr' >>$CONFIG_STATUS - echo ': clr' >>$CONFIG_STATUS - sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS - echo 'CEOF - sed -f $tmp/undefs.sed $tmp/in >$tmp/out - rm -f $tmp/in - mv $tmp/out $tmp/in -' >>$CONFIG_STATUS - sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail - rm -f conftest.undefs - mv conftest.tail conftest.undefs -done -rm -f conftest.undefs - -cat >>$CONFIG_STATUS <<\_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - if test x"$ac_file" = x-; then - echo "/* Generated by configure. */" >$tmp/config.h - else - echo "/* $ac_file. Generated by configure. */" >$tmp/config.h - fi - cat $tmp/in >>$tmp/config.h - rm -f $tmp/in - if test x"$ac_file" != x-; then - if diff $ac_file $tmp/config.h >/dev/null 2>&1; then - { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -echo "$as_me: $ac_file is unchanged" >&6;} - else - ac_dir=`(dirname "$ac_file") 2>/dev/null || -$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_file" : 'X\(//\)[^/]' \| \ - X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - rm -f $ac_file - mv $tmp/config.h $ac_file - fi - else - cat $tmp/config.h - rm -f $tmp/config.h - fi -done -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF - -# -# CONFIG_COMMANDS section. -# -for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue - ac_dest=`echo "$ac_file" | sed 's,:.*,,'` - ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` - ac_dir=`(dirname "$ac_dest") 2>/dev/null || -$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$ac_dest" : 'X\(//\)[^/]' \| \ - X"$ac_dest" : 'X\(//\)$' \| \ - X"$ac_dest" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$ac_dest" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - { if $as_mkdir_p; then - mkdir -p "$ac_dir" - else - as_dir="$ac_dir" - as_dirs= - while test ! -d "$as_dir"; do - as_dirs="$as_dir $as_dirs" - as_dir=`(dirname "$as_dir") 2>/dev/null || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| \ - . : '\(.\)' 2>/dev/null || -echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } - /^X\(\/\/\)[^/].*/{ s//\1/; q; } - /^X\(\/\/\)$/{ s//\1/; q; } - /^X\(\/\).*/{ s//\1/; q; } - s/.*/./; q'` - done - test ! -n "$as_dirs" || mkdir $as_dirs - fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} - { (exit 1); exit 1; }; }; } - - ac_builddir=. - -if test "$ac_dir" != .; then - ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` - # A "../" for each directory in $ac_dir_suffix. - ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -else - ac_dir_suffix= ac_top_builddir= -fi - -case $srcdir in - .) # No --srcdir option. We are building in place. - ac_srcdir=. - if test -z "$ac_top_builddir"; then - ac_top_srcdir=. - else - ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` - fi ;; - [\\/]* | ?:[\\/]* ) # Absolute path. - ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir ;; - *) # Relative path. - ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_builddir$srcdir ;; -esac - -# Do not use `cd foo && pwd` to compute absolute paths, because -# the directories may not exist. -case `pwd` in -.) ac_abs_builddir="$ac_dir";; -*) - case "$ac_dir" in - .) ac_abs_builddir=`pwd`;; - [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; - *) ac_abs_builddir=`pwd`/"$ac_dir";; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_builddir=${ac_top_builddir}.;; -*) - case ${ac_top_builddir}. in - .) ac_abs_top_builddir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; - *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_srcdir=$ac_srcdir;; -*) - case $ac_srcdir in - .) ac_abs_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; - *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; - esac;; -esac -case $ac_abs_builddir in -.) ac_abs_top_srcdir=$ac_top_srcdir;; -*) - case $ac_top_srcdir in - .) ac_abs_top_srcdir=$ac_abs_builddir;; - [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; - *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; - esac;; -esac - - - { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -echo "$as_me: executing $ac_dest commands" >&6;} - case $ac_dest in - default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > src/stamp-h ;; - esac -done -_ACEOF - -cat >>$CONFIG_STATUS <<\_ACEOF - -{ (exit 0); exit 0; } -_ACEOF -chmod +x $CONFIG_STATUS -ac_clean_files=$ac_clean_files_save - - -# configure is writing to config.log, and then calls config.status. -# config.status does its own redirection, appending to config.log. -# Unfortunately, on DOS this fails, as config.log is still kept open -# by configure, so config.status won't be able to write to it; its -# output is simply discarded. So we exec the FD to /dev/null, -# effectively closing config.log, so it can be properly (re)opened and -# appended to by config.status. When coming back to configure, we -# need to make the FD available again. -if test "$no_create" != yes; then - ac_cs_success=: - ac_config_status_args= - test "$silent" = yes && - ac_config_status_args="$ac_config_status_args --quiet" - exec 5>/dev/null - $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. - $ac_cs_success || { (exit 1); exit 1; } -fi - -# plugins/Makefile plugins/libwmfun/Makefile) - - - - - - -cat <get-wraster-flags -#!/bin/sh - -WCFLAGS="$inc_search_path" -WLFLAGS="$lib_search_path" -WLIBS="-lwraster $GFXLIBS $XLIBS -lm" - -usage="Usage: get-wraster-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" - -if test \$# -eq 0; then - echo "\${usage}" 1>&2 - exit 1 -fi - -while test \$# -gt 0; do - case \$1 in - --cflags) - echo \$WCFLAGS - ;; - --ldflags|--lflags) - echo \$WLFLAGS - ;; - --libs) - echo \$WLIBS - ;; - *) - echo "\${usage}" 1>&2 - exit 1 - ;; - esac - shift -done - - -EOF - -cat < wrlib/wrlib.pc -Name: wrlib -Description: Image manipulation and conversion library -Version: $VERSION -Libs: $lib_search_path -lwraster $GFXLIBS $XLIBS -lm -Cflags: $inc_search_path -EOF - -cat <get-wings-flags -#!/bin/sh - -WCFLAGS="$inc_search_path" -WLFLAGS="$lib_search_path" -WLIBS="-lWINGs -lwraster $GFXLIBS $XFTLIBS $XLIBS -lm $NETLIBS $INTLIBS" - -usage="Usage: get-wings-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" - -if test \$# -eq 0; then - echo "\${usage}" 1>&2 - exit 1 -fi - -while test \$# -gt 0; do - case \$1 in - --cflags) - echo \$WCFLAGS - ;; - --ldflags|--lflags) - echo \$WLFLAGS - ;; - --libs) - echo \$WLIBS - ;; - *) - echo "\${usage}" 1>&2 - exit 1 - ;; - esac - shift -done - - -EOF - -cat < WINGs/WINGs.pc -Name: WINGs -Description: Small widget set with the NeXTStep(TM) look and feel -Version: $VERSION -Requires: wrlib -Libs: $lib_search_path -lWINGs $XFTLIBS $XLIBS -lm $NETLIBS $INTLIBS -Cflags: $inc_search_path -EOF - -cat <get-wutil-flags -#!/bin/sh - -WCFLAGS="-I`eval echo ${includedir}`" -WLFLAGS="-L${_libdir}" -WLIBS="-lWUtil $NETLIBS $INTLIBS" - -usage="Usage: get-wutil-flags #lp#--cflags#rp# #lp#--ldflags#rp# #lp#--libs#rp#" - -if test \$# -eq 0; then - echo "\${usage}" 1>&2 - exit 1 -fi - -while test \$# -gt 0; do - case \$1 in - --cflags) - echo \$WCFLAGS - ;; - --ldflags|--lflags) - echo \$WLFLAGS - ;; - --libs) - echo \$WLIBS - ;; - *) - echo "\${usage}" 1>&2 - exit 1 - ;; - esac - shift -done - - -EOF - -cat < wmlib/wmlib.pc -Name: wmlib -Description: FIXME: What do I write here? -Version: $VERSION -Requires: wrlib -Libs: $lib_search_path -lWUtil $NETLIBS $INTLIBS -Cflags: $inc_search_path -EOF - -sed 's/#lp#/[/g' get-wraster-flags | sed 's/#rp#/]/g' > wrlib/get-wraster-flags -sed 's/#lp#/[/g' get-wings-flags | sed 's/#rp#/]/g' > WINGs/get-wings-flags -sed 's/#lp#/[/g' get-wutil-flags | sed 's/#rp#/]/g' > WINGs/get-wutil-flags - -chmod 755 wrlib/get-wraster-flags WINGs/get-wings-flags WINGs/get-wutil-flags - -rm -f get-wraster-flags get-wings-flags get-wutil-flags - - - -supported_gfx="$supported_gfx builtin-PPM" - -if test "x$MOFILES" = "x"; then - mof=None -else - mof=`echo $MOFILES` -fi - -if test "x$MOFILES" = "x"; then - languages=None -else - languages=`echo $MOFILES | sed 's/.mo//g'` -fi - -echo -echo "Window Maker was configured as follows:" -echo -echo "Installation path prefix : $prefix" -echo "Installation path for binaries : $_bindir" -echo "Installation path for WPrefs.app : $with_appspath" | sed -e 's|\${prefix}|'"$prefix|" -echo "Supported graphic format libraries : $supported_gfx" -echo "Use assembly routines for wrlib : $asm_support" -echo "Use inline MMX(tm) x86 assembly : $mmx_support" -echo "Antialiased text support in WINGs : $xft" -echo "Xinerama extension support : $xinerama" -echo "Translated message files to install : $mof" -if test "x$MOFILES" != "x"; then - echo "Installation path for translations : $NLSDIR" | sed -e 's|\$(prefix)|'"$prefix|" -fi -echo - - -if test "x$ac_cv_header_jpeglib_h" != xyes; then -echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING" -echo -echo "JPEG support will not be included because the JPEG library is" -echo "not installed correctly or was not found. Background images" -echo "from themes will not display as they usually are JPEG files." -echo -echo "To fix, download and install the jpeg library and/or make sure you" -echo "installed all jpeg related packages, SPECIALLY the development packages" -echo "like jpeg-devel (if you use some prepackaged version of libjpeg)." -echo -echo "WARNING WARNING WARNING WARNING WARNING WARNING WARNING" -fi - - - diff -Naur WindowMaker-0.91.0/configure.ac wm/configure.ac --- WindowMaker-0.91.0/configure.ac 2004-10-26 08:09:57 +0400 +++ wm/configure.ac 2005-01-06 18:48:42 +0300 @@ -15,24 +15,10 @@ -AM_INIT_AUTOMAKE(WindowMaker, 0.91.0) +AM_INIT_AUTOMAKE(WindowMaker, 0.92.0) AC_PROG_LIBTOOL -dnl # by Marcelo Magallon -dnl # Turn around -rpath problem with libtool 1.0c -dnl # This define should be improbable enough to not conflict with anything -dnl case ${host} in -dnl *-pc-linux-gnu) -dnl AC_MSG_RESULT([Fixing libtool for -rpath problems.]) -dnl sed < libtool > libtool-2 \ -dnl 's/^hardcode_libdir_flag_spec.*$/hardcode_libdir_flag_spec=" -D__LIBTOOL_IS_A_FOOL__ "/' -dnl mv libtool-2 libtool -dnl chmod 755 libtool -dnl ;; -dnl esac - - AM_CONFIG_HEADER(src/config.h) @@ -205,23 +191,19 @@ asm_support=no mmx_support=no if test "$ac_cv_prog_gcc" = yes; then - - # gcc-3.4 complains about some of our stuff without this - NOSTRICTALIASING="-fno-strict-aliasing" - x86=0 - changequote(,)dnl - case "$host_cpu" in - i[3456]86) x86=1 - ;; - esac - changequote([,])dnl + # gcc-3.3 or newer complains about some of our stuff without this + NOSTRICTALIASING="-fno-strict-aliasing" - if test "$host_os" != "linux" -a "$host_os" != "linux-gnu" ; then - x86=0 - fi + 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":: + "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, + ac_cv_c_inline_asm=no)]) - if test $x86 = 1; then + if test "x$ac_cv_c_inline_asm" = xyes; then AC_DEFINE(ASM_X86, 1, [define if processor is x86 (normally detected by configure)]) asm_support=yes @@ -299,8 +281,8 @@ dnl List of supported locales dnl ------------------------- -supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW.Big5" -supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW.Big5" +supported_locales="be bg bs ca cs da de el es et fi fr gl hr hu it ja ko ms nl no pl pt ro ru sk sv tr zh_CN zh_TW" +supported_wprefs_locales="bg ca cs de es et fi fr hr hu it ja ko pt ru sk zh_CN zh_TW" supported_wings_locales="bg ca cs de fr sk" for lang in $LINGUAS; do @@ -535,7 +517,7 @@ exit 1 fi -minXFT="2.1.2" +minXFT="2.1.0" goodxft="no" dnl @@ -846,25 +828,30 @@ dnl Support for GNUSTEP_LOCAL_ROOT, for WPrefs.app dnl ============================================== -appspath="" - AC_ARG_WITH(appspath, -[ --with-appspath=PATH specify the directory for GNUstep applications], appspath=$withval ) +[ --with-gnustepdir=PATH specify the directory for GNUstep applications]) + +appspath=$with_gnustepdir -if test "x$appspath" = "x"; then - gnustepdir='${prefix}/GNUstep' +if test "x$appspath$GNUSTEP_LOCAL_ROOT" = "x"; then + wprefs_base_dir=${prefix} + wprefs_datadir="${datadir}/WPrefs" + wprefs_bindir="${bindir}" +else + gnustepdir=$appspath if test "x$GNUSTEP_LOCAL_ROOT" != "x" ; then gnustepdir=`echo "$GNUSTEP_LOCAL_ROOT" | sed -e "s|^${prefix}|prefix|"` gnustepdir=`echo $gnustepdir | sed -e 's|^prefix|${prefix}|'` fi - with_appspath=$gnustepdir/Applications + wprefs_base_dir=$gnustepdir/Applications + wprefs_datadir=$wprefs_base_dir/WPrefs.app + wprefs_bindir=$wprefs_base_dir/WPrefs.app fi -wprefsdir=$with_appspath/WPrefs.app - -AC_SUBST(wprefsdir) +AC_SUBST(wprefs_datadir) +AC_SUBST(wprefs_bindir) dnl Enable User Defined Menu thing @@ -907,7 +894,8 @@ WINGs/Makefile WINGs/WINGs/Makefile WINGs/Documentation/Makefile \ WINGs/Examples/Makefile WINGs/Resources/Makefile WINGs/Tests/Makefile \ WINGs/Extras/Makefile WINGs/po/Makefile \ - wmlib/Makefile wrlib/Makefile src/Makefile src/wconfig.h \ + wmlib/Makefile wrlib/Makefile wrlib/tests/Makefile \ + src/Makefile src/wconfig.h \ doc/Makefile doc/sk/Makefile \ WindowMaker/Makefile WindowMaker/Backgrounds/Makefile \ WindowMaker/Defaults/Makefile WindowMaker/IconSets/Makefile \ @@ -1098,7 +1086,7 @@ echo echo "Installation path prefix : $prefix" echo "Installation path for binaries : $_bindir" -echo "Installation path for WPrefs.app : $with_appspath" | sed -e 's|\${prefix}|'"$prefix|" +echo "Installation path for WPrefs.app : $wprefs_base_dir" | sed -e 's|\${prefix}|'"$prefix|" echo "Supported graphic format libraries : $supported_gfx" echo "Use assembly routines for wrlib : $asm_support" echo "Use inline MMX(tm) x86 assembly : $mmx_support" diff -Naur WindowMaker-0.91.0/contrib/CVS/Entries wm/contrib/CVS/Entries --- WindowMaker-0.91.0/contrib/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/contrib/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1,8 @@ +/.cvsignore/1.5/Wed Apr 2 11:37:09 2003// +/Makefile.am/1.4/Fri Jan 25 13:51:54 2002// +/README/1.7/Tue May 20 04:43:20 2003// +/WindowMaker.spec.in/1.5/Sun Oct 24 03:20:29 2004// +/single_click.diff/1.7/Sat Oct 23 21:40:59 2004// +/workspace_flip.patch/1.1/Mon Aug 20 18:11:44 2001// +/yubn_moveres.diff/1.1/Fri Jan 25 13:51:54 2002// +D diff -Naur WindowMaker-0.91.0/contrib/CVS/Repository wm/contrib/CVS/Repository --- WindowMaker-0.91.0/contrib/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/contrib/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/contrib diff -Naur WindowMaker-0.91.0/contrib/CVS/Root wm/contrib/CVS/Root --- WindowMaker-0.91.0/contrib/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/contrib/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/contrib/.cvsignore wm/contrib/.cvsignore --- WindowMaker-0.91.0/contrib/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/contrib/.cvsignore 2003-04-02 15:37:09 +0400 @@ -0,0 +1,3 @@ +Makefile Makefile.in +WindowMaker.spec +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/contrib/Makefile.in wm/contrib/Makefile.in --- WindowMaker-0.91.0/contrib/Makefile.in 2004-10-26 08:10:47 +0400 +++ wm/contrib/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,219 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -EXTRA_DIST = README single_click.diff WindowMaker.spec.in workspace_flip.patch yubn_moveres.diff -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../src/config.h -CONFIG_CLEAN_FILES = WindowMaker.spec -DIST_COMMON = README Makefile.am Makefile.in WindowMaker.spec.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -WindowMaker.spec: $(top_builddir)/config.status WindowMaker.spec.in - cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = contrib - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/COPYING.OPL wm/COPYING.OPL --- WindowMaker-0.91.0/COPYING.OPL 1970-01-01 03:00:00 +0300 +++ wm/COPYING.OPL 1999-02-17 14:06:40 +0300 @@ -0,0 +1,91 @@ + + OpenContent License (OPL) + Version 1.0, July 14, 1998. + + This document outlines the principles underlying the OpenContent + (OC) movement and may be redistributed provided it remains + unaltered. For legal purposes, this document is the license under + which OpenContent is made available for use. + + The original version of this document may be found at + http://www.opencontent.org/opl.shtml + + LICENSE + + Terms and Conditions for Copying, Distributing, and Modifying + + Items other than copying, distributing, and modifying the Content + with which this license was distributed (such as using, etc.) are + outside the scope of this license. + + 1. You may copy and distribute exact replicas of the OpenContent + (OC) as you receive it, in any medium, provided that you + conspicuously and appropriately publish on each copy an appropriate + copyright notice and disclaimer of warranty; keep intact all the + notices that refer to this License and to the absence of any + warranty; and give any other recipients of the OC a copy of this + License along with the OC. You may at your option charge a fee for + the media and/or handling involved in creating a unique copy of the + OC for use offline, you may at your option offer instructional + support for the OC in exchange for a fee, or you may at your option + offer warranty in exchange for a fee. You may not charge a fee for + the OC itself. You may not charge a fee for the sole service of + providing access to and/or use of the OC via a network (e.g. the + Internet), whether it be via the world wide web, FTP, or any other + method. + + 2. You may modify your copy or copies of the OpenContent or any + portion of it, thus forming works based on the Content, and + distribute such modifications or work under the terms of Section 1 + above, provided that you also meet all of these conditions: + + a) You must cause the modified content to carry prominent notices + stating that you changed it, the exact nature and content of the + changes, and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the OC or any part + thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License, unless otherwise permitted + under applicable Fair Use law. + + These requirements apply to the modified work as a whole. If + identifiable sections of that work are not derived from the OC, and + can be reasonably considered independent and separate works in + themselves, then this License, and its terms, do not apply to those + sections when you distribute them as separate works. But when you + distribute the same sections as part of a whole which is a work + based on the OC, the distribution of the whole must be on the terms + of this License, whose permissions for other licensees extend to + the entire whole, and thus to each and every part regardless of who + wrote it. Exceptions are made to this requirement to release + modified works free of charge under this license only in compliance + with Fair Use law where applicable. + + 3. You are not required to accept this License, since you have not + signed it. However, nothing else grants you permission to copy, + distribute or modify the OC. These actions are prohibited by law if + you do not accept this License. Therefore, by distributing or + translating the OC, or by deriving works herefrom, you indicate + your acceptance of this License to do so, and all its terms and + conditions for copying, distributing or translating the OC. + + NO WARRANTY + + 4. BECAUSE THE OPENCONTENT (OC) IS LICENSED FREE OF CHARGE, THERE + IS NO WARRANTY FOR THE OC, TO THE EXTENT PERMITTED BY APPLICABLE + LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS + AND/OR OTHER PARTIES PROVIDE THE OC "AS IS" WITHOUT WARRANTY OF ANY + KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, + THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE. THE ENTIRE RISK OF USE OF THE OC IS WITH YOU. + SHOULD THE OC PROVE FAULTY, INACCURATE, OR OTHERWISE UNACCEPTABLE + YOU ASSUME THE COST OF ALL NECESSARY REPAIR OR CORRECTION. + + 5. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN + WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY + MIRROR AND/OR REDISTRIBUTE THE OC AS PERMITTED ABOVE, BE LIABLE TO + YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR + CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE + THE OC, EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE + POSSIBILITY OF SUCH DAMAGES. diff -Naur WindowMaker-0.91.0/CVS/Entries wm/CVS/Entries --- WindowMaker-0.91.0/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/CVS/Entries 2005-05-17 22:43:10 +0400 @@ -0,0 +1,34 @@ +/.cvsignore/1.10/Wed Apr 2 11:37:04 2003// +/AUTHORS/1.18/Thu Jan 31 10:30:06 2002// +/BUGFORM/1.7/Thu Oct 14 23:05:20 2004// +/BUGS/1.18/Sat Oct 23 03:30:03 2004// +/COPYING/1.1.1.1/Tue Sep 29 22:36:29 1998// +/COPYING.OPL/1.1/Wed Feb 17 11:06:40 1999// +/COPYING.WTFPL/1.2/Sat Jan 26 04:24:12 2002// +/ChangeLog/1.278/Sun May 15 16:45:02 2005// +/FAQ/1.16/Thu Jan 6 15:48:42 2005// +/FAQ.I18N/1.4/Fri Oct 22 00:21:51 2004// +/FAQ.I18N.cs/1.2/Fri Oct 22 00:21:51 2004// +/FAQ.I18N.sk/1.3/Fri Oct 22 00:21:51 2004// +/INSTALL/1.37/Sun Oct 24 03:20:29 2004// +/INSTALL.cs/1.4/Sun Oct 24 03:20:29 2004// +/INSTALL.es/1.5/Sun Oct 24 03:20:29 2004// +/INSTALL.fr/1.5/Sun Oct 24 03:20:29 2004// +/INSTALL.pt/1.4/Sun Oct 24 03:20:29 2004// +/INSTALL.sk/1.4/Sun Oct 24 03:20:29 2004// +/MIRRORS/1.5/Wed Feb 17 11:06:40 1999// +/Makefile.am/1.33/Sat Oct 23 00:25:52 2004// +/NEWS/1.82/Fri Mar 11 23:05:43 2005// +/README/1.24/Thu Oct 14 23:05:20 2004// +/README.definable-cursor/1.3/Fri Nov 23 05:39:13 2001// +/README.es/1.3/Thu Oct 14 23:05:20 2004// +/README.pt/1.2/Thu Oct 14 23:05:20 2004// +/TODO/1.56/Sat Oct 23 02:28:50 2004// +/acinclude.m4/1.10/Sat Oct 30 06:39:27 2004// +/autogen.sh/1.2/Mon Mar 4 06:28:14 2002// +/configure.ac/1.61/Thu Jan 6 15:48:42 2005// +/install-sh/1.3/Fri Jan 29 08:11:17 1999// +/missing/1.4/Mon Oct 28 22:52:18 2002// +/mkinstalldirs/1.2/Fri Jan 29 08:11:17 1999// +/mkpatch/1.6/Sat May 29 21:41:25 1999// +D diff -Naur WindowMaker-0.91.0/CVS/Entries.Log wm/CVS/Entries.Log --- WindowMaker-0.91.0/CVS/Entries.Log 1970-01-01 03:00:00 +0300 +++ wm/CVS/Entries.Log 2005-05-17 22:43:30 +0400 @@ -0,0 +1,12 @@ +A D/WINGs//// +A D/WPrefs.app//// +A D/WindowMaker//// +A D/contrib//// +A D/doc//// +A D/plugins//// +A D/po//// +A D/src//// +A D/test//// +A D/util//// +A D/wmlib//// +A D/wrlib//// diff -Naur WindowMaker-0.91.0/CVS/Repository wm/CVS/Repository --- WindowMaker-0.91.0/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/CVS/Repository 2005-05-17 22:43:08 +0400 @@ -0,0 +1 @@ +wm diff -Naur WindowMaker-0.91.0/CVS/Root wm/CVS/Root --- WindowMaker-0.91.0/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/CVS/Root 2005-05-17 22:43:08 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/.cvsignore wm/.cvsignore --- WindowMaker-0.91.0/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/.cvsignore 2003-04-02 15:37:04 +0400 @@ -0,0 +1,8 @@ +Makefile Makefile.in +aclocal.m4 +configure config.log config.cache config.guess config.status config.sub +libtool ltconfig ltmain.sh +autom4te.cache +.psrc .inslog2 tca.map tca.log pchdir *.rpt +update +WindowMaker*.tar.gz diff -Naur WindowMaker-0.91.0/doc/cs/CVS/Entries wm/doc/cs/CVS/Entries --- WindowMaker-0.91.0/doc/cs/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1,11 @@ +/Makefile.am/1.2/Sat Oct 23 00:00:03 2004// +/geticonset.1x/1.1/Mon Feb 18 13:50:30 2002// +/getstyle.1x/1.1/Mon Feb 18 13:50:30 2002// +/seticons.1x/1.1/Mon Feb 18 13:50:30 2002// +/setstyle.1x/1.1/Mon Feb 18 13:50:30 2002// +/wdwrite.1x/1.1/Mon Feb 18 13:50:30 2002// +/wmaker.1x/1.1/Mon Feb 18 13:50:30 2002// +/wmsetbg.1x/1.1/Mon Feb 18 13:50:30 2002// +/wxcopy.1x/1.1/Mon Feb 18 13:50:30 2002// +/wxpaste.1x/1.1/Mon Feb 18 13:50:30 2002// +D diff -Naur WindowMaker-0.91.0/doc/cs/CVS/Repository wm/doc/cs/CVS/Repository --- WindowMaker-0.91.0/doc/cs/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/doc/cs diff -Naur WindowMaker-0.91.0/doc/cs/CVS/Root wm/doc/cs/CVS/Root --- WindowMaker-0.91.0/doc/cs/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/doc/cs/geticonset.1x wm/doc/cs/geticonset.1x --- WindowMaker-0.91.0/doc/cs/geticonset.1x 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/geticonset.1x 2002-02-18 16:50:30 +0300 @@ -0,0 +1,36 @@ +.\" Hey, Emacs! This is an -*- nroff -*- source file. +.TH geticonset 1x "Leden 1999" +.SH JMNO +geticonset \- extrahuje aktuln sadu ikon Window Makera +.SH SYNTAXE +.B geticonset +.I [volby] [soubor] +.SH POPIS +.B geticonset +nata domnu WMWindowAttributes a zape sadu nalezench ikon +bu na standardtn vstup nebo do +.I souboru. +.SH VOLBY +.TP +.B \-\-help +vype npovdu +.TP +.B \-\-version +vype slo verze +.SH PROMNN PROSTED +.IP GNUSTEP_USER_ROOT +specifikuje cestu k adresi Defaults. etzec "Defaults/" je pidn k tto +promnn, m se ur umstn databz. Jakmile promnn nen nastaven, +tak jej implicitn hodnota je "~/GNUstep" +.SH SOUBORY +.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes +Toto je soubor, kter se zape. +.SH PODVEJTE SE TAK +.BR seticons (1x), +.BR wmaker (1x) +.SH AUTOR +Autorem Window Makera je Alfredo K. Kojima . +.PP +Tuto manulovou strnku napsal Marcelo Magallon . +.PP +Do etiny peloil Ji Hndek . diff -Naur WindowMaker-0.91.0/doc/cs/getstyle.1x wm/doc/cs/getstyle.1x --- WindowMaker-0.91.0/doc/cs/getstyle.1x 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/getstyle.1x 2002-02-18 16:50:30 +0300 @@ -0,0 +1,54 @@ +.\" Hey, Emacs! This is an -*- nroff -*- source file. +.TH getstyle 1x "Leden 1999" +.SH JMNO +getstyle \- vytvo balk s aktulnm stylem Window Makera. +.SH SYNTAXE +.B getstyle +[[-t|--theme-options] [-p|--pack] [soubor se stylem]] +.SH POPIS +.B getstyle +me bu vypsat konfiguran informace aktulnho stylu Window Makera do +souboru/standardnho vstupu nebo vytvoit samostatn balk s tmatem. Balk +s tmatem je adres, kter obsahuje vechno potebn pro distributovateln +tma, informace o stylech a obrzcch. + +Dejte pozor na to, e informace o stylu uloen v globln konfiguraci +systmu se nenataj. + +Standardn se ulo nasledn vlastnosti: \fIIconBack\fP, +\fIIconBack\fP, \fITitleJustify\fP, \fIWindowTitleFont\fP, +\fIMenuTitleFont, MenuTextFont\fP, \fIIconTitleFont\fP, +\fIDisplayFont\fP, \fIHighlightColor\fP, \fIHighlightTextColor\fP, +\fIIconTitleColor\fP, \fICClipTitleColor\fP, \fIIconBackColor\fP, +\fIFTitleColor\fP, \fIPTitleColor\fP, \fIUTitleColor\fP, +\fIFTitleBack\fP, \fIPTitleBack, UTitleBack\fP, \fIMenuTitleColor\fP, +\fIMenuTextColor\fP, \fIMenuDisabledColor\fP, \fIMenuTitleBack\fP and +\fIMenuTextBack\fP. Jakmile je dna volba \fB-t\fP nebo \fB--theme-options\fP, +vlastnost \fIWorkspaceBack\fP se ulo tak. + +.SH VOLBY +.TP +.B \-t +ulo i informace souvisejc s tmatem, co je textura pozad hlavnho okna. +Tato volba je vdy nastaven, jakmile je pouit volba \-p. +.TP +.B \-p +vytvo balk s tmatem v adresi nazvanm podla jmna tmatu s pponou .themed. + +.SH PROMNN PROSTED +.IP GNUSTEP_USER_ROOT +specifikuje cestu k adresi Defaults. etzec "Defaults/" je pidn k tto +promnn, m se ur umstn databz. Jakmile promnn nen nastaven, +tak jej implicitn hodnota je "~/GNUstep" +.SH SOUBORY +.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker +Toto je soubor, kter se zape. +.SH PODVEJTE SE TAK +.BR setstyle (1x), +.BR wmaker (1x) +.SH AUTOR +Autorem Window Makera je Alfredo K. Kojima . +.PP +Tuto manulovou strnku napsal Marcelo Magallon . +.PP +Do etiny ploil Ji Hndek . diff -Naur WindowMaker-0.91.0/doc/cs/Makefile.am wm/doc/cs/Makefile.am --- WindowMaker-0.91.0/doc/cs/Makefile.am 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/Makefile.am 2004-10-23 04:00:03 +0400 @@ -0,0 +1,17 @@ +## Process this file with automake to produce Makefile.in + +mandir=@mandir@/cs + +man_MANS = \ + geticonset.1x \ + setstyle.1x \ + wxpaste.1x \ + getstyle.1x \ + wdwrite.1x \ + wmsetbg.1x \ + seticons.1x \ + wmaker.1x \ + wxcopy.1x + +EXTRA_DIST = $(man_MANS) + diff -Naur WindowMaker-0.91.0/doc/cs/seticons.1x wm/doc/cs/seticons.1x --- WindowMaker-0.91.0/doc/cs/seticons.1x 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/seticons.1x 2002-02-18 16:50:30 +0300 @@ -0,0 +1,38 @@ +.\" Hey, Emacs! This is an -*- nroff -*- source file. +.TH seticons 1x "Bezen 1998" +.SH JMNO +seticons \- nastav ikony pro Window Maker +.SH SYNTAXe +.B seticons +.I soubor +.SH POPIS +.B seticons +nata +.I soubor +a zape jeho obsah do domny WMWindowAttributes, m se nastav ikony, +kter pouv Window Maker pro dan tdy (napklad XTerm, "xterm.XTerm", +"pine.XTerm", atd.) +.SH VOLBY +.TP +.B \-\-help +vype npovdu +.TP +.B \-\-version +vype slo verze +.SH PROMNN PROSTED +.IP GNUSTEP_USER_ROOT +specifikuje cestu k adresi Defaults. etzec "Defaults/" je pidn k tto +promnn, m se ur umstn databz. Jakmile promnn nen nastaven, +tak jej implicitn hodnota je "~/GNUstep" +.SH SOUBORY +.IP GNUSTEP_USER_ROOT/Defaults/WMWindowAttributes +Toto je soubor, kter se zape. +.SH PODVEJTE SE TAK +.BR geticonset (1x), +.BR wmaker (1x) +.SH AUTOR +Autorem Window Makera je Alfredo K. Kojima . +.PP +Tuto manulovou strnku napsal Marcelo Magallon . +.PP +Do etiny peloil Ji Hndek . diff -Naur WindowMaker-0.91.0/doc/cs/setstyle.1x wm/doc/cs/setstyle.1x --- WindowMaker-0.91.0/doc/cs/setstyle.1x 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/setstyle.1x 2002-02-18 16:50:30 +0300 @@ -0,0 +1,47 @@ +.\" Hey, Emacs! This is an -*- nroff -*- source file. +.TH setstyle 1x "Leden 1999" +.SH JMNO +setstyle \- zmn nastaven Window Makera souvisejc se stylem nebo +zavede tma +.SH SYNTAXE +.B setstyle +.I "[--no-fonts] [--help] [--version]" +.I soubor se stylem +.SH DESCRIPTION +.B setstyle +nat +.I soubor se stylem +a zape jeho obsah do domny Window Makera, m nastav aktuln styl +Window Makera. Jakmile je poskytnut cesta, adres bude povaovan za balk +s tmatem a podla toho bude i zaveden. Jakmile je dan argument +\fB\-\-no\-fonts\fP, nastaven souvisejc s fonty (\fIIconTitleFont\fP, +\fIClipTitleFont\fP, \fIDisplayFont\fP, \fIMenuTextFont\fP, +\fIMenuTitleFont\fP, \fIWindowTitleFont\fP) v souboru se stylem budou +ignorovan. +.SH VOLBY +.TP +.B \-\-no\-fonts +ignorovat nastaven font v souboru se stylem. +.TP +.B \-\-help +vype npovdu +.TP +.B \-\-version +vype slo verze +.SH PROMNN PROSTED +.IP GNUSTEP_USER_ROOT +specifikuje cestu k adresi Defaults. etzec "Defaults/" je pidn k tto +promnn, m se ur umstn databz. Jakmile promnn nen nastaven, +tak jej implicitn hodnota je "~/GNUstep" +.SH SOUBORY +.IP GNUSTEP_USER_ROOT/Defaults/WindowMaker +Toto je soubor, kter se zape. +.SH PODVEJTE SE TAK +.BR getstyle (1x), +.BR wmaker (1x) +.SH AUTOR +Autorem Window Makera je Alfredo K. Kojima . +.PP +Tuto manulovou strnku napsal Marcelo Magallon . +.PP +Do etiny peloil Ji Hndek . diff -Naur WindowMaker-0.91.0/doc/cs/wdwrite.1x wm/doc/cs/wdwrite.1x --- WindowMaker-0.91.0/doc/cs/wdwrite.1x 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/wdwrite.1x 2002-02-18 16:50:30 +0300 @@ -0,0 +1,39 @@ +.\" Hey, Emacs! This is an -*- nroff -*- source file. +.TH wdwrite 1x "Leden 1999" +.SH JMNO +wdwrite \- zape kle a hodnoty do databze standardnch nastaven +.SH SYNTAXE +.B wdwrite +.I domna +.I volba +.I hodnota +.SH POPIS +.B wdwrite +zape +.I volbu +a +.I hodnotu +do dan +.I domny. +.SH VOLBY +.TP +.B \-\-help +vype npovdu +.TP +.B \-\-version +vype slo verze +.SH PROMNN PROSTED +.IP GNUSTEP_USER_ROOT +specifikuje cestu k adresi Defaults. etzec "Defaults/" je pidn k tto +promnn, m se ur umstn databz. Jakmile promnn nen nastaven, +tak jej implicitn hodnota je "~/GNUstep" +.SH SOUBORY +Domny se nachzej v GNUSTEP_USER_ROOT/Defaults/ +.SH PODVEJTE SE TAK +.BR wmaker (1x) +.SH AUTOR +Autorem Window Makera je Alfredo K. Kojima . +.PP +Tuto manulovou strnku napsal Marcelo Magallon . +.PP +Do etiny peloil Ji Hndek diff -Naur WindowMaker-0.91.0/doc/cs/wmaker.1x wm/doc/cs/wmaker.1x --- WindowMaker-0.91.0/doc/cs/wmaker.1x 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/wmaker.1x 2002-02-18 16:50:30 +0300 @@ -0,0 +1,148 @@ +.\" Hey, Emacs! This is an -*- nroff -*- source file. +.TH Window\ Maker 1x "Srpen 1998" +.SH JMNO +wmaker \- okenn manaer pro X11 se vzhledem NEXTSTEPu +.SH SYNTAXE +.B wmaker +.I "[-volby]" +.SH "POPIS" +Window Maker je okenn manaer pro X11 se vzhledem NEXTSTEPu. Sna se +napodobit vzhled NeXTu jak jen to je mon, ale v ppad poteby tento +trend nedodruje. +.SH "VOLBY" +.TP +.B \-\-no\-cpp +zakzat preprocessing konfiguranch soubor +.TP +.B \-\-no\-dock +neotvrat Dok aplikac +.TP +.B \-\-no\-clip +neotvrat Sponku pracovnch ploch +.TP +.B \-display host:display.screen +pout danou obrazovku. +Na strojch s vce obrazovkami bude Window Maker automaticky spravovat +vechny obrazovky. Pokud chcete, aby Window Maker spravoval jen specifickou +obrazovku, muste zadat slo obrazovky pomoc argumentu pkazov dky +.B \-display. +Napklad, pokud chcete, aby Window Maker spravoval jen obrazovku 1, spuste ho +takto: +.B wmaker -display :0.1 +.TP +.B \-\-version +vype verzi a ukon se +.TP +.B \-\-visual\-id +ur sla obrazovho reimu. Spuste +.BR xdpyinfo (1x) +pro seznam obrazovch reim dostupnch na vaem displeji. +.TP +.B \-\-help +vype krtk pomocn text +.PP +.SH SOUBORY +.TP +.B ~/GNUstep/Defaults/WindowMaker +veobecn nastaven Window Makera. +.TP +.B ~/GNUstep/Defaults/WMState +informace o Doku a Sponce. Neditujte za bhu Window Makera. Bude +pepsan. +.TP +.B ~/GNUstep/Defaults/WMRootMenu +Obsahuje jmno souboru, z kterho se m nast hlavn menu nebo +menu samotn ve formtu proplist. +.TP +.B ~/GNUstep/Defaults/WMWindowAttributes +Atributy pro rzn tdy a instance aplikac. Pouijte editor nastaven +(stisknte prav tlatko myi na horn lit aplikace, zvolte Atributy) +namsto pmho editovn tohoto souboru. Je jen mlo nastaven, kter +nejsou dostupn z editora nastaven. +.TP +.B /usr/share/WindowMaker/Defaults/ +Vechny ve uveden soubory se NATAJ odtud. Pokud se je nepoda +najt, krom WMState, kter se odtud ZKOPRUJE. Nezle na tom, odkud +jsou natan. Pokud je poteba zapsat zmnu konfigurace zpt do tchto +soubor, zapou se do uivatelskch soubor. +.TP +.B ~/GNUstep/Library/WindowMaker/autostart +Tento skript se automaticky vykon pri startu Window Makera. +.TP +.B ~/GNUstep/Library/WindowMaker/exitscript +Tento skript se automaticky vykon bezprostedn ped ukonenm Window Makera. +.B Poznmka: +Kdy potebujete spustit z tohoto skriptu nco, co vyaduje sputn X server, +tak nepouvejte na ukonen Window Makera pkaz +.I SHUTDOWN +z hlavnho menu. Jinak se me stt, e X server se ukon dv ne se vykon +tento skript. +.TP +.B ~/GNUstep/Library/WindowMaker/ +Soubor menu, jeho nzev je uveden v souboru WMRootMenu, se hled zde... +.TP +.B /etc/X11/WindowMaker/ +a zde, v tomto poad, pokud nzev nen absolutn cesta. +.TP +.B ~/GNUstep/Library/WindowMaker/Pixmaps/ +Zde hled Window Maker obrzky +.TP +.B ~/GNUstep/Library/WindowMaker/Backgrounds/ +Zde hled Window Maker pozad +.TP +.B ~/GNUstep/Library/WindowMaker/Styles/ +Zde hled Window Maker soubory se styly (ne pln... vypad to tak, ale +i tak muste zadat plnou cestu. Je to jen vyhrazen msto, aby byly +vci pkn uspodan) +.TP +.B ~/GNUstep/Library/WindowMaker/Themes/ +Zde hled Window Maker soubory s tmaty (viz. ve) +.TP +.B /usr/share/WindowMaker/Pixmaps/ +Obrzky spolon pro cel systm se nachzej zde... +.TP +.B /usr/share/WindowMaker/Pixmaps/ +a zde. +.TP +.B /usr/share/WindowMaker/Styles/ +Styly spolon pro cel systm se nachzej zde +.TP +.B /usr/share/WindowMaker/Themes/ +A te to zkuste sami... ;-) +.SH PROMNN PROSED +.IP GNUSTEP_USER_ROOT +specifikuje cestu k adresi Defaults. "Defaults/" je pidn k tto +promnn, m se ur umstn databz. Pokud promnn nen nastaven, +ta jej implicitn hodnota je "~/GNUstep" +.IP GNUSTEP_LOCAL_ROOT +specifikuje umstn systmovho \fBloklnho\fP GNUstep adrese (to +je uiten v ppad, e umstn adrese spolenho pro cel systm je +ve skutenosti spolen pro celou s). Kdy je tato promnn przdna, pouije +se GNUSTEP_SYSTEM_ROOT. +.IP GNUSTEP_SYSTEM_ROOT +specifikuje umstn systmovho GNUstep adrese. Pokud je tato promnn +przdna, tak jej implicitn hodnota je /etc/GNUstep +.SH PODVEJTE SE TAK +The Window Maker User Guide +(Uivatelsk pruka Window Makera) +.PP +The Window Maker FAQ +(asto kladen dotazy) +.PP +.BR X (1x), +.BR wdwrite (1x), +.BR wxcopy (1x), +.BR geticonset (1x), +.BR seticons (1x), +.BR wmaker (1x), +.BR wxpaste (1x), +.BR getstyle (1x), +.BR setstyle (1x), +.BR wmsetbg (1x) +.SH AUTOR +Autoi Window Makera jsou Alfredo K. Kojima , +Dan Pascu a mnoho dalch lid z celho svta. +.PP +Tuto manulovou strnku napsal Marcelo E. Magallon, . +.PP +Do etiny peloil Ji Hndek diff -Naur WindowMaker-0.91.0/doc/cs/wmsetbg.1x wm/doc/cs/wmsetbg.1x --- WindowMaker-0.91.0/doc/cs/wmsetbg.1x 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/wmsetbg.1x 2002-02-18 16:50:30 +0300 @@ -0,0 +1,67 @@ +.\" Hey, Emacs! This is an -*- nroff -*- source file. +.TH wmsetbg 1x "Leden 1999" +.SH JMNO +wmsetbg \- nastav pozad hlavnho okna v X11 +.SH SYNTAXE +.B wmsetbg +[-display] [--version] [--help] [{-b|--back-color} \fIbarva\fP] +[{-t|--tile}|{-e|--center}|{-s|--scale}|{-a|--maxscale} \fIobrzek\fP] +[{-d|--dither}|{-m|--match}] [-u|--update-wmaker] +[{-D|--update-domain} \fIdomna\fP] [{-c|--colors} \fIcpc\fP] +[{-p|--parse} \fItextura\fP] [{-w|--workspace} \fIpracovn plocha\fP] +.SH POPIS +.B wmsetbg +nat dan +.I obrzek +(XPM, PNG, jpeg, Tiff, raw PPM) a vlo ho do hlavnho okna. Obrzek je mon +zvtit, nebo ho opakovat aby vyplnil hlavn okno. Window Maker pouva +tento pkaz intern na nastaven pozad pi startu. +.SH VOLBY +.TP +.B -a|--maxscale +zvt dan \fIobrzek\fP pi dodren pomru stran +.TP +.B -e|--center +vlo \fIobrzek\fP do stedu okna +.TP +.B -t|--tile +vytvo z \fIobrzku\fP dladice +.TP +.B -s|--scale +rozthne dan \fIobrzek\fP (standartn) +.TP +.B -d|--dither +rezervuje barvy +.TP +.B -m|--match +shodn barvy +.TP +.B -u|--update-wmaker +zape zmnu do databze nastaven Window Makera +.TP +.B -D|--update-domain +zape zmnu do databze \fIdomny\fP +.TP +.B -c|--colors +pouje urit poet barev na kanl +.TP +.B -p|--parse +parsuje danou \fItexturu\fP jako \fIproplist stylu textur\fP +.TP +.B -w|--workspace +nastav pozad jen na dan \fIpracovn ploe\fP +.TP +.B \-\-help +vype npovdu +.TP +.B \-\-version +vype slo verze +.SH PODVEJTE SE TAK +.BR wmaker (1x) +.SH AUTOR +Autorem Window Makera je Alfredo K. Kojima . +wmsetbg napsal Dan Pascu +.PP +Tuto manulovou strnku napsal Marcelo Magallon . +.PP +Do etiny peloil Ji Hndek . diff -Naur WindowMaker-0.91.0/doc/cs/wxcopy.1x wm/doc/cs/wxcopy.1x --- WindowMaker-0.91.0/doc/cs/wxcopy.1x 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/wxcopy.1x 2002-02-18 16:50:30 +0300 @@ -0,0 +1,45 @@ +.\" Hey, Emacs! This is an -*- nroff -*- source file. +.TH wxcopy 1x "Z 1998" +.SH JMNO +wxcopy \- kopruje standartn vstup do vyrovnvac pamti +.SH SYNOPSIS +.B wxcopy +[volby] +[soubor] +.SH POPIS +.B wxcopy +kopruje standartn vstup nebo +.I soubor +do vyrovnvac pamti. Jakmile nen dn njak vyrovnvac pam, tak se +data kopruj do vyrovnvac pamti 0 a ostan vyrovnvac pamti rotuj, +jestlie ovem existuj. Pokud je dn vyrovnvac pam, tak se data +kopruj do n a nevykon se dn rotovn. +.SH VOLBY +.TP +.B \-cutbuffer slo +Specifikuje slo vyrovnvac pamti, do kter se budou koprovat data. +.TP +.B \-display displej +Data se budou koprovat do vyrovnvac pamti danho displeje/obrazovky. +.TP +.B \-nolimit +Vypne normln limit velikosti dat 64kb, m se umon zvtovn vyrovnvac +pamti podla poteby. +.TP +.B \-clearselection +Vyprzdn vlastnka PRIMARY selekce. V praxi to znamen, e kdy se pokuste +vloit data prostednm tlatkem (napklad), tak vlo se data z vyrovnvac +pamti 0, namsto ppadnho sputn selelekce myi. +.PP +.SH PODVEJTE SE TAK +.BR wxpaste (1x), +.BR wmaker (1x) +.SH AUTOR +Autorem Window Makera je Alfredo K. Kojima . +.PP +Tuto manulovou strnku napsal Marcelo Magallon . +.PP +Do etiny peloil Ji Hndek . +.PP +Kompatibilitu s binrnmi daty a \-nolimit implementoval Luke Kendall +. diff -Naur WindowMaker-0.91.0/doc/cs/wxpaste.1x wm/doc/cs/wxpaste.1x --- WindowMaker-0.91.0/doc/cs/wxpaste.1x 1970-01-01 03:00:00 +0300 +++ wm/doc/cs/wxpaste.1x 2002-02-18 16:50:30 +0300 @@ -0,0 +1,40 @@ +.\" Hey, Emacs! This is an -*- nroff -*- source file. +.TH wxpaste 1x "Bezen 1998" +.SH JMNO +wxpaste \- zape vyrovnvac pam na standardn vstup +.SH SYNTAXE +.B wxpaste +[volby] +.SH POPIS +.B wxpaste +vype obsah dan vyrovnvac pamti na standardn vstup. Jakmile nen +zadna dn vyrovnvac pam, tak se pouije vyrovnvac pam 0. +.PP +.SH VOLBY +.TP +.B \-cutbuffer slo +Data budou vloena z dan vyrovnvac pamti namsto standardn 0. +.TP +.B \-display displej +Data se budou koprovat z vyrovnvac pamti danho displeje/obrazovky. +.TP +.B \-selection [selekcia] +Data budou koprovan z dan selekce. Jakmile se vbr ze selekce nepoda, +tak se pouije vyrovnvac pam. Implicitn hodnota pro selekci je PRIMARY. +.PP +.SH CHYBY +\-selection mus bt posledn volba. Syntaxe me bt upraven, ale +brn tomu patn kompatibilita. + +Typy selekc INCR a MULTIPLE nejsou podporovan. Ve skutenosti je +podporovan jen jednoduch text, co by mlo stait pro vtinu uivatel +takovto jednoduch utilitky. +.SH PODVEJTE SE TAK +.BR wxcopy (1x), +.BR wmaker (1x) +.SH AUTOR +Autorem Window Makera je Alfredo K. Kojima . +.PP +Tuto manulovou strnku napsal Marcelo Magallon . +.PP +Do etiny peloil Ji Hndek . diff -Naur WindowMaker-0.91.0/doc/CVS/Entries wm/doc/CVS/Entries --- WindowMaker-0.91.0/doc/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/doc/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1,12 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:10 2003// +/Makefile.am/1.7/Sat Oct 23 00:00:03 2004// +/geticonset.1x/1.3/Wed Feb 17 11:06:46 1999// +/getstyle.1x/1.5/Thu Sep 6 09:42:52 2001// +/seticons.1x/1.3/Wed Feb 17 11:06:46 1999// +/setstyle.1x/1.5/Thu Sep 6 09:42:52 2001// +/wdwrite.1x/1.3/Wed Feb 17 11:06:46 1999// +/wmaker.1x/1.3/Wed Feb 17 11:06:46 1999// +/wmsetbg.1x/1.4/Sat Aug 2 21:36:46 2003// +/wxcopy.1x/1.2/Wed Oct 21 14:43:50 1998// +/wxpaste.1x/1.2/Wed Oct 21 14:43:50 1998// +D diff -Naur WindowMaker-0.91.0/doc/CVS/Entries.Log wm/doc/CVS/Entries.Log --- WindowMaker-0.91.0/doc/CVS/Entries.Log 1970-01-01 03:00:00 +0300 +++ wm/doc/CVS/Entries.Log 2005-05-17 22:43:25 +0400 @@ -0,0 +1,2 @@ +A D/cs//// +A D/sk//// diff -Naur WindowMaker-0.91.0/doc/CVS/Repository wm/doc/CVS/Repository --- WindowMaker-0.91.0/doc/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/doc/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/doc diff -Naur WindowMaker-0.91.0/doc/CVS/Root wm/doc/CVS/Root --- WindowMaker-0.91.0/doc/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/doc/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/doc/.cvsignore wm/doc/.cvsignore --- WindowMaker-0.91.0/doc/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/doc/.cvsignore 2003-04-02 15:37:10 +0400 @@ -0,0 +1,2 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/doc/Makefile.in wm/doc/Makefile.in --- WindowMaker-0.91.0/doc/Makefile.in 2004-10-26 08:10:46 +0400 +++ wm/doc/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,370 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -SUBDIRS = sk - -man_MANS = geticonset.1x getstyle.1x seticons.1x setstyle.1x wdwrite.1x wmaker.1x wmsetbg.1x wxcopy.1x wxpaste.1x - - -EXTRA_DIST = $(man_MANS) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../src/config.h -CONFIG_CLEAN_FILES = -man1dir = $(mandir)/man1 -MANS = $(man_MANS) - -NROFF = nroff -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-man1: - $(mkinstalldirs) $(DESTDIR)$(man1dir) - @list='$(man1_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ - done - -uninstall-man1: - @list='$(man1_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ - done -install-man: $(MANS) - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-man1 -uninstall-man: - @$(NORMAL_UNINSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = doc - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive -check-am: all-am -check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -install-exec-am: -install-exec: install-exec-recursive - -install-data-am: install-man -install-data: install-data-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: uninstall-man -uninstall: uninstall-recursive -all-am: Makefile $(MANS) -all-redirect: all-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-recursive - -clean-am: clean-tags clean-generic mostlyclean-am - -clean: clean-recursive - -distclean-am: distclean-tags distclean-generic clean-am - -rm -f libtool - -distclean: distclean-recursive - -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-recursive - -.PHONY: install-man1 uninstall-man1 install-man uninstall-man \ -install-data-recursive uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/doc/sk/CVS/Entries wm/doc/sk/CVS/Entries --- WindowMaker-0.91.0/doc/sk/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/doc/sk/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1,12 @@ +/.cvsignore/1.2/Wed Apr 2 11:37:10 2003// +/Makefile.am/1.2/Sat Oct 23 00:00:03 2004// +/geticonset.1x/1.1/Tue Jul 24 12:05:12 2001// +/getstyle.1x/1.1/Tue Jul 24 12:05:12 2001// +/seticons.1x/1.1/Tue Jul 24 12:05:12 2001// +/setstyle.1x/1.1/Tue Jul 24 12:05:12 2001// +/wdwrite.1x/1.1/Tue Jul 24 12:05:12 2001// +/wmaker.1x/1.1/Tue Jul 24 12:05:12 2001// +/wmsetbg.1x/1.1/Tue Jul 24 12:05:12 2001// +/wxcopy.1x/1.1/Tue Jul 24 12:05:12 2001// +/wxpaste.1x/1.1/Tue Jul 24 12:05:12 2001// +D diff -Naur WindowMaker-0.91.0/doc/sk/CVS/Repository wm/doc/sk/CVS/Repository --- WindowMaker-0.91.0/doc/sk/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/doc/sk/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/doc/sk diff -Naur WindowMaker-0.91.0/doc/sk/CVS/Root wm/doc/sk/CVS/Root --- WindowMaker-0.91.0/doc/sk/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/doc/sk/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/doc/sk/.cvsignore wm/doc/sk/.cvsignore --- WindowMaker-0.91.0/doc/sk/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/doc/sk/.cvsignore 2003-04-02 15:37:10 +0400 @@ -0,0 +1,2 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/doc/sk/Makefile.in wm/doc/sk/Makefile.in --- WindowMaker-0.91.0/doc/sk/Makefile.in 2004-10-26 08:10:46 +0400 +++ wm/doc/sk/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,265 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -mandir = @mandir@/sk - -man_MANS = geticonset.1x setstyle.1x wxpaste.1x getstyle.1x wdwrite.1x wmsetbg.1x seticons.1x wmaker.1x wxcopy.1x - - -EXTRA_DIST = $(man_MANS) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -man1dir = $(mandir)/man1 -MANS = $(man_MANS) - -NROFF = nroff -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/sk/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-man1: - $(mkinstalldirs) $(DESTDIR)$(man1dir) - @list='$(man1_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ - else file=$$i; fi; \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ - $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ - done - -uninstall-man1: - @list='$(man1_MANS)'; \ - l2='$(man_MANS)'; for i in $$l2; do \ - case "$$i" in \ - *.1*) list="$$list $$i" ;; \ - esac; \ - done; \ - for i in $$list; do \ - ext=`echo $$i | sed -e 's/^.*\\.//'`; \ - inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ - inst=`echo $$inst | sed '$(transform)'`.$$ext; \ - echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ - rm -f $(DESTDIR)$(man1dir)/$$inst; \ - done -install-man: $(MANS) - @$(NORMAL_INSTALL) - $(MAKE) $(AM_MAKEFLAGS) install-man1 -uninstall-man: - @$(NORMAL_UNINSTALL) - $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = doc/sk - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-man -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-man -uninstall: uninstall-am -all-am: Makefile $(MANS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: install-man1 uninstall-man1 install-man uninstall-man tags \ -distdir info-am info dvi-am dvi check check-am installcheck-am \ -installcheck install-exec-am install-exec install-data-am install-data \ -install-am install uninstall-am uninstall all-redirect all-am all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/FAQ wm/FAQ --- WindowMaker-0.91.0/FAQ 2004-10-23 07:47:32 +0400 +++ wm/FAQ 2005-01-06 18:48:42 +0300 @@ -366,7 +366,7 @@ 2.8 Can I use WindowMaker with KDE or GNOME or CDE? --------------------------------------------------- -Contrary to a lot of people think, KDE is NOT a window manager. KDE is +Contrary to what a lot of people think, KDE is NOT a window manager. KDE is a suite of various applications that includes a custom window manager (kwm). The same is true for CDE. diff -Naur WindowMaker-0.91.0/ltmain.sh wm/ltmain.sh --- WindowMaker-0.91.0/ltmain.sh 2004-10-26 08:10:35 +0400 +++ wm/ltmain.sh 1970-01-01 03:00:00 +0300 @@ -1,6430 +0,0 @@ -# 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 -# Free Software Foundation, Inc. -# Originally by Gordon Matzigkeit , 1996 -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# As a special exception to the GNU General Public License, if you -# distribute this file as part of a program that contains a -# configuration script generated by Autoconf, you may include it under -# the same distribution terms that you use for the rest of that program. - -basename="s,^.*/,,g" - -# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh -# is ksh but when the shell is invoked as "sh" and the current value of -# the _XPG environment variable is not equal to 1 (one), the special -# positional parameter $0, within a function call, is the name of the -# function. -progpath="$0" - -# The name of this program: -progname=`echo "$progpath" | $SED $basename` -modename="$progname" - -# Global variables: -EXIT_SUCCESS=0 -EXIT_FAILURE=1 - -PROGRAM=ltmain.sh -PACKAGE=libtool -VERSION=1.5.6 -TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 215 $" - - -# Check that we have a working $echo. -if test "X$1" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift -elif test "X$1" = X--fallback-echo; then - # Avoid inline document here, it may be left over - : -elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then - # Yippee, $echo works! - : -else - # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$progpath" --no-reexec ${1+"$@"} -fi - -if test "X$1" = X--fallback-echo; then - # used as fallback echo - shift - cat <&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE -fi - -# Global variables. -mode=$default_mode -nonopt= -prev= -prevopt= -run= -show="$echo" -show_help= -execute_dlfiles= -lo2o="s/\\.lo\$/.${objext}/" -o2lo="s/\\.${objext}\$/.lo/" - -##################################### -# Shell function definitions: -# This seems to be the best place for them - -# 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 () { - win32_libid_type="unknown" - win32_fileres=`file -L $1 2>/dev/null` - case $win32_fileres in - *ar\ archive\ import\ library*) # definitely import - win32_libid_type="x86 archive import" - ;; - *ar\ archive*) # could be an import, or static - if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ - $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then - win32_nmres=`eval $NM -f posix -A $1 | \ - sed -n -e '1,100{/ I /{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 - fi - ;; - *DLL*) - win32_libid_type="x86 DLL" - ;; - *executable*) # but shell scripts are "executable" too... - case $win32_fileres in - *MS\ Windows\ PE\ Intel*) - win32_libid_type="x86 DLL" - ;; - esac - ;; - esac - $echo $win32_libid_type -} - - -# func_infer_tag arg -# Infer tagged configuration to use if any are available and -# if one wasn't chosen via the "--tag" command line option. -# Only attempt this if the compiler in the base compile -# command doesn't match the default compiler. -# arg is usually of the form 'gcc ...' -func_infer_tag () { - if test -n "$available_tags" && test -z "$tagname"; then - CC_quoted= - for arg in $CC; do - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case $@ in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" - CC_quoted= - for arg in $CC; do - # Double-quote args containing other shell metacharacters. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - CC_quoted="$CC_quoted $arg" - done - case "$@ " in - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 - exit $EXIT_FAILURE -# else -# $echo "$modename: using $tagname tagged configuration" - fi - ;; - esac - fi -} -# End of Shell function definitions -##################################### - -# Darwin sucks -eval std_shrext=\"$shrext_cmds\" - -# Parse our command line options once, thoroughly. -while test "$#" -gt 0 -do - arg="$1" - shift - - case $arg in - -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;; - *) optarg= ;; - esac - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - execute_dlfiles) - execute_dlfiles="$execute_dlfiles $arg" - ;; - tag) - tagname="$arg" - preserve_args="${preserve_args}=$arg" - - # Check whether tagname contains only valid characters - case $tagname in - *[!-_A-Za-z0-9,/]*) - $echo "$progname: invalid tag name: $tagname" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - case $tagname in - CC) - # Don't test for the "default" C tag, as we know, it's there, but - # not specially marked. - ;; - *) - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then - taglist="$taglist $tagname" - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" - else - $echo "$progname: ignoring unknown tag $tagname" 1>&2 - fi - ;; - esac - ;; - *) - eval "$prev=\$arg" - ;; - esac - - prev= - prevopt= - continue - fi - - # Have we seen a non-optional argument yet? - case $arg in - --help) - show_help=yes - ;; - - --version) - $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP" - $echo - $echo "Copyright (C) 2003 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 - ;; - - --config) - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath - # Now print the configurations for the tags. - for tagname in $taglist; do - ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" - done - exit $EXIT_SUCCESS - ;; - - --debug) - $echo "$progname: enabling shell trace mode" - set -x - preserve_args="$preserve_args $arg" - ;; - - --dry-run | -n) - run=: - ;; - - --features) - $echo "host: $host" - if test "$build_libtool_libs" = yes; then - $echo "enable shared libraries" - else - $echo "disable shared libraries" - fi - if test "$build_old_libs" = yes; then - $echo "enable static libraries" - else - $echo "disable static libraries" - fi - exit $EXIT_SUCCESS - ;; - - --finish) mode="finish" ;; - - --mode) prevopt="--mode" prev=mode ;; - --mode=*) mode="$optarg" ;; - - --preserve-dup-deps) duplicate_deps="yes" ;; - - --quiet | --silent) - show=: - preserve_args="$preserve_args $arg" - ;; - - --tag) prevopt="--tag" prev=tag ;; - --tag=*) - set tag "$optarg" ${1+"$@"} - shift - prev=tag - preserve_args="$preserve_args --tag" - ;; - - -dlopen) - prevopt="-dlopen" - prev=execute_dlfiles - ;; - - -*) - $echo "$modename: unrecognized option \`$arg'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - - *) - nonopt="$arg" - break - ;; - esac -done - -if test -n "$prevopt"; then - $echo "$modename: option \`$prevopt' requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE -fi - -# If this variable is set in any of the actions, the command in it -# will be execed at the end. This prevents here-documents from being -# left over by shells. -exec_cmd= - -if test -z "$show_help"; then - - # Infer the operation mode. - if test -z "$mode"; then - $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2 - $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2 - case $nonopt in - *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*) - mode=link - for arg - do - case $arg in - -c) - mode=compile - break - ;; - esac - done - ;; - *db | *dbx | *strace | *truss) - mode=execute - ;; - *install*|cp|mv) - mode=install - ;; - *rm) - mode=uninstall - ;; - *) - # If we have no mode, but dlfiles were specified, then do execute mode. - test -n "$execute_dlfiles" && mode=execute - - # Just use the default operation mode. - if test -z "$mode"; then - if test -n "$nonopt"; then - $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2 - else - $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2 - fi - fi - ;; - esac - fi - - # Only execute mode is allowed to have -dlopen flags. - if test -n "$execute_dlfiles" && test "$mode" != execute; then - $echo "$modename: unrecognized option \`-dlopen'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Change the help message to a mode-specific one. - generic_help="$help" - help="Try \`$modename --help --mode=$mode' for more information." - - # These modes are in order of execution frequency so that they run quickly. - case $mode in - # libtool compile mode - compile) - modename="$modename: compile" - # Get the compilation command and the source file. - base_compile= - srcfile="$nonopt" # always keep a non-empty value in "srcfile" - suppress_opt=yes - suppress_output= - arg_mode=normal - libobj= - later= - - for arg - do - case "$arg_mode" in - arg ) - # do not "continue". Instead, add this to base_compile - lastarg="$arg" - arg_mode=normal - ;; - - target ) - libobj="$arg" - arg_mode=normal - continue - ;; - - normal ) - # Accept any command-line options. - case $arg in - -o) - if test -n "$libobj" ; then - $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit $EXIT_FAILURE - fi - arg_mode=target - continue - ;; - - -static | -prefer-pic | -prefer-non-pic) - later="$later $arg" - continue - ;; - - -no-suppress) - suppress_opt=no - continue - ;; - - -Xcompiler) - arg_mode=arg # the next one goes into the "base_compile" arg list - continue # The current "srcfile" will either be retained or - ;; # replaced later. I would guess that would be a bug. - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` - lastarg= - save_ifs="$IFS"; IFS=',' - for arg in $args; do - IFS="$save_ifs" - - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - lastarg="$lastarg $arg" - done - IFS="$save_ifs" - lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"` - - # Add the arguments to base_compile. - base_compile="$base_compile $lastarg" - continue - ;; - - * ) - # Accept the current argument as the source file. - # The previous "srcfile" becomes the current argument. - # - lastarg="$srcfile" - srcfile="$arg" - ;; - esac # case $arg - ;; - esac # case $arg_mode - - # Aesthetically quote the previous argument. - lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"` - - case $lastarg in - # Double-quote args containing other shell metacharacters. - # Many Bourne shells cannot handle close brackets correctly - # in scan sets, so we specify it separately. - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - lastarg="\"$lastarg\"" - ;; - esac - - base_compile="$base_compile $lastarg" - done # for arg - - case $arg_mode in - arg) - $echo "$modename: you must specify an argument for -Xcompile" - exit $EXIT_FAILURE - ;; - target) - $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit $EXIT_FAILURE - ;; - *) - # Get the name of the library object. - [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'` - ;; - esac - - # Recognize several different file suffixes. - # If the user specifies -o file.o, it is replaced with file.lo - xform='[cCFSifmso]' - case $libobj in - *.ada) xform=ada ;; - *.adb) xform=adb ;; - *.ads) xform=ads ;; - *.asm) xform=asm ;; - *.c++) xform=c++ ;; - *.cc) xform=cc ;; - *.ii) xform=ii ;; - *.class) xform=class ;; - *.cpp) xform=cpp ;; - *.cxx) xform=cxx ;; - *.f90) xform=f90 ;; - *.for) xform=for ;; - *.java) xform=java ;; - esac - - libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"` - - case $libobj in - *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; - *) - $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - func_infer_tag $base_compile - - for arg in $later; do - case $arg in - -static) - build_old_libs=yes - continue - ;; - - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no - continue - ;; - esac - done - - objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` - xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$obj"; then - xdir= - else - xdir=$xdir/ - fi - lobj=${xdir}$objdir/$objname - - if test -z "$base_compile"; then - $echo "$modename: you must specify a compilation command" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Delete any leftover library objects. - if test "$build_old_libs" = yes; then - removelist="$obj $lobj $libobj ${libobj}T" - else - removelist="$lobj $libobj ${libobj}T" - fi - - $run $rm $removelist - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - - # On Cygwin there's no "real" PIC flag so we must build both object types - case $host_os in - cygwin* | mingw* | pw32* | os2*) - pic_mode=default - ;; - esac - if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then - # non-PIC code in shared libraries is not supported - pic_mode=default - fi - - # Calculate the filename of the output object if compiler does - # not support -o with -c - if test "$compiler_c_o" = no; then - output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} - lockfile="$output_obj.lock" - removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 - else - output_obj= - need_locks=no - lockfile= - fi - - # Lock this critical section if it is needed - # We use this script file to make the link, it avoids creating a new file - if test "$need_locks" = yes; then - until $run ln "$progpath" "$lockfile" 2>/dev/null; do - $show "Waiting for $lockfile to be removed" - sleep 2 - done - elif test "$need_locks" = warn; then - if test -f "$lockfile"; then - $echo "\ -*** ERROR, $lockfile exists and contains: -`cat $lockfile 2>/dev/null` - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - $echo $srcfile > "$lockfile" - fi - - if test -n "$fix_srcfile_path"; then - eval srcfile=\"$fix_srcfile_path\" - fi - - $run $rm "$libobj" "${libobj}T" - - # Create a libtool object file (analogous to a ".la" file), - # but don't create it if we're doing a dry run. - test -z "$run" && cat > ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed, then go on to compile the next one - if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then - $show "$mv $output_obj $lobj" - if $run $mv $output_obj $lobj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # Append the name of the PIC object to the libtool object file. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T </dev/null`" != "X$srcfile"; then - $echo "\ -*** ERROR, $lockfile contains: -`cat $lockfile 2>/dev/null` - -but it should contain: -$srcfile - -This indicates that another process is trying to use the same -temporary object file, and libtool could not work around it because -your compiler does not support \`-c' and \`-o' together. If you -repeat this compilation, it may succeed, by chance, but you had better -avoid parallel builds (make -j) in this platform, or get a better -compiler." - - $run $rm $removelist - exit $EXIT_FAILURE - fi - - # Just move the object if needed - if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then - $show "$mv $output_obj $obj" - if $run $mv $output_obj $obj; then : - else - error=$? - $run $rm $removelist - exit $error - fi - fi - - # Append the name of the non-PIC object the libtool object file. - # Only append if the libtool object file exists. - test -z "$run" && cat >> ${libobj}T <> ${libobj}T <&2 - fi - if test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - else - if test -z "$pic_flag" && test -n "$link_static_flag"; then - dlopen_self=$dlopen_self_static - fi - fi - build_libtool_libs=no - build_old_libs=yes - prefer_static_libs=yes - break - ;; - esac - done - - # See if our shared archives depend on static archives. - test -n "$old_archive_from_new_cmds" && build_old_libs=yes - - # Go through the arguments, transforming them on the way. - while test "$#" -gt 0; do - arg="$1" - shift - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test - ;; - *) qarg=$arg ;; - esac - libtool_args="$libtool_args $qarg" - - # If the previous option needs an argument, assign it. - if test -n "$prev"; then - case $prev in - output) - compile_command="$compile_command @OUTPUT@" - finalize_command="$finalize_command @OUTPUT@" - ;; - esac - - case $prev in - dlfiles|dlprefiles) - if test "$preload" = no; then - # Add the symbol object into the linking commands. - compile_command="$compile_command @SYMFILE@" - finalize_command="$finalize_command @SYMFILE@" - preload=yes - fi - case $arg in - *.la | *.lo) ;; # We handle these cases below. - force) - if test "$dlself" = no; then - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - self) - if test "$prev" = dlprefiles; then - dlself=yes - elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then - dlself=yes - else - dlself=needless - export_dynamic=yes - fi - prev= - continue - ;; - *) - if test "$prev" = dlfiles; then - dlfiles="$dlfiles $arg" - else - dlprefiles="$dlprefiles $arg" - fi - prev= - continue - ;; - esac - ;; - expsyms) - export_symbols="$arg" - if test ! -f "$arg"; then - $echo "$modename: symbol file \`$arg' does not exist" - exit $EXIT_FAILURE - fi - prev= - continue - ;; - expsyms_regex) - export_symbols_regex="$arg" - prev= - continue - ;; - inst_prefix) - inst_prefix_dir="$arg" - prev= - continue - ;; - precious_regex) - precious_files_regex="$arg" - prev= - continue - ;; - release) - release="-$arg" - prev= - continue - ;; - objectlist) - if test -f "$arg"; then - save_arg=$arg - moreargs= - for fil in `cat $save_arg` - do -# moreargs="$moreargs $fil" - arg=$fil - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= - - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi - - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - done - else - $echo "$modename: link input file \`$save_arg' does not exist" - exit $EXIT_FAILURE - fi - arg=$save_arg - prev= - continue - ;; - rpath | xrpath) - # We need an absolute path. - case $arg in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - if test "$prev" = rpath; then - case "$rpath " in - *" $arg "*) ;; - *) rpath="$rpath $arg" ;; - esac - else - case "$xrpath " in - *" $arg "*) ;; - *) xrpath="$xrpath $arg" ;; - esac - fi - prev= - continue - ;; - xcompiler) - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - xlinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $wl$qarg" - prev= - compile_command="$compile_command $wl$qarg" - finalize_command="$finalize_command $wl$qarg" - continue - ;; - xcclinker) - linker_flags="$linker_flags $qarg" - compiler_flags="$compiler_flags $qarg" - prev= - compile_command="$compile_command $qarg" - finalize_command="$finalize_command $qarg" - continue - ;; - shrext) - shrext_cmds="$arg" - prev= - continue - ;; - *) - eval "$prev=\"\$arg\"" - prev= - continue - ;; - esac - fi # test -n "$prev" - - prevarg="$arg" - - case $arg in - -all-static) - if test -n "$link_static_flag"; then - compile_command="$compile_command $link_static_flag" - finalize_command="$finalize_command $link_static_flag" - fi - continue - ;; - - -allow-undefined) - # FIXME: remove this flag sometime in the future. - $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2 - continue - ;; - - -avoid-version) - avoid_version=yes - continue - ;; - - -dlopen) - prev=dlfiles - continue - ;; - - -dlpreopen) - prev=dlprefiles - continue - ;; - - -export-dynamic) - export_dynamic=yes - continue - ;; - - -export-symbols | -export-symbols-regex) - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: more than one -exported-symbols argument is not allowed" - exit $EXIT_FAILURE - fi - if test "X$arg" = "X-export-symbols"; then - prev=expsyms - else - prev=expsyms_regex - fi - continue - ;; - - -inst-prefix-dir) - prev=inst_prefix - continue - ;; - - # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:* - # so, if we see these flags be careful not to treat them like -L - -L[A-Z][A-Z]*:*) - case $with_gcc/$host in - no/*-*-irix* | /*-*-irix*) - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - ;; - esac - continue - ;; - - -L*) - dir=`$echo "X$arg" | $Xsed -e 's/^-L//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit $EXIT_FAILURE - fi - dir="$absdir" - ;; - esac - case "$deplibs " in - *" -L$dir "*) ;; - *) - deplibs="$deplibs -L$dir" - lib_search_path="$lib_search_path $dir" - ;; - esac - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - case :$dllsearchpath: in - *":$dir:"*) ;; - *) dllsearchpath="$dllsearchpath:$dir";; - esac - ;; - esac - continue - ;; - - -l*) - if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then - case $host in - *-*-cygwin* | *-*-pw32* | *-*-beos*) - # These systems don't actually have a C or math library (as such) - continue - ;; - *-*-mingw* | *-*-os2*) - # These systems don't actually have a C library (as such) - test "X$arg" = "X-lc" && continue - ;; - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C and math libraries are in the System framework - deplibs="$deplibs -framework System" - continue - esac - elif test "X$arg" = "X-lc_r"; then - case $host in - *-*-openbsd* | *-*-freebsd*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; - esac - fi - deplibs="$deplibs $arg" - continue - ;; - - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - deplibs="$deplibs $arg" - continue - ;; - - -module) - module=yes - 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*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - if test "$with_gcc" = "yes" ; then - compiler_flags="$compiler_flags $arg" - fi - continue - ;; - - -shrext) - prev=shrext - continue - ;; - - -no-fast-install) - fast_install=no - continue - ;; - - -no-install) - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - # The PATH hackery in wrapper scripts is required on Windows - # in order for the loader to find any dlls it needs. - $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2 - $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2 - fast_install=no - ;; - *) no_install=yes ;; - esac - continue - ;; - - -no-undefined) - allow_undefined=no - continue - ;; - - -objectlist) - prev=objectlist - continue - ;; - - -o) prev=output ;; - - -precious-files-regex) - prev=precious_regex - continue - ;; - - -release) - prev=release - continue - ;; - - -rpath) - prev=rpath - continue - ;; - - -R) - prev=xrpath - continue - ;; - - -R*) - dir=`$echo "X$arg" | $Xsed -e 's/^-R//'` - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit $EXIT_FAILURE - ;; - esac - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - continue - ;; - - -static) - # The effects of -static are defined in a previous loop. - # We used to do the same as -all-static on platforms that - # didn't have a PIC flag, but the assumption that the effects - # would be equivalent was wrong. It would break on at least - # Digital Unix and AIX. - continue - ;; - - -thread-safe) - thread_safe=yes - continue - ;; - - -version-info) - prev=vinfo - continue - ;; - -version-number) - prev=vinfo - vinfo_number=yes - continue - ;; - - -Wc,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - - -Wl,*) - args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'` - arg= - save_ifs="$IFS"; IFS=',' - for flag in $args; do - IFS="$save_ifs" - case $flag in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - flag="\"$flag\"" - ;; - esac - arg="$arg $wl$flag" - compiler_flags="$compiler_flags $wl$flag" - linker_flags="$linker_flags $flag" - done - IFS="$save_ifs" - arg=`$echo "X$arg" | $Xsed -e "s/^ //"` - ;; - - -Xcompiler) - prev=xcompiler - continue - ;; - - -Xlinker) - prev=xlinker - continue - ;; - - -XCClinker) - prev=xcclinker - continue - ;; - - # Some other compiler flag. - -* | +*) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - - *.$objext) - # A standard object. - objs="$objs $arg" - ;; - - *.lo) - # A libtool-controlled object. - - # Check to see that this really is a libtool object. - if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - pic_object= - non_pic_object= - - # Read the .lo file - # If there is no directory component, then add one. - case $arg in - */* | *\\*) . $arg ;; - *) . ./$arg ;; - esac - - if test -z "$pic_object" || \ - test -z "$non_pic_object" || - test "$pic_object" = none && \ - test "$non_pic_object" = none; then - $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit $EXIT_FAILURE - fi - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - if test "$pic_object" != none; then - # Prepend the subdirectory the object is found in. - pic_object="$xdir$pic_object" - - if test "$prev" = dlfiles; then - if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then - dlfiles="$dlfiles $pic_object" - prev= - continue - else - # If libtool objects are unsupported, then we need to preload. - prev=dlprefiles - fi - fi - - # CHECK ME: I think I busted this. -Ossama - if test "$prev" = dlprefiles; then - # Preload the old-style object. - dlprefiles="$dlprefiles $pic_object" - prev= - fi - - # A PIC object. - libobjs="$libobjs $pic_object" - arg="$pic_object" - fi - - # Non-PIC object. - if test "$non_pic_object" != none; then - # Prepend the subdirectory the object is found in. - non_pic_object="$xdir$non_pic_object" - - # A standard non-PIC object - non_pic_objects="$non_pic_objects $non_pic_object" - if test -z "$pic_object" || test "$pic_object" = none ; then - arg="$non_pic_object" - fi - fi - else - # Only an error if not doing a dry-run. - if test -z "$run"; then - $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit $EXIT_FAILURE - else - # Dry-run case. - - # Extract subdirectory from the argument. - xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'` - if test "X$xdir" = "X$arg"; then - xdir= - else - xdir="$xdir/" - fi - - pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"` - non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"` - libobjs="$libobjs $pic_object" - non_pic_objects="$non_pic_objects $non_pic_object" - fi - fi - ;; - - *.$libext) - # An archive. - deplibs="$deplibs $arg" - old_deplibs="$old_deplibs $arg" - continue - ;; - - *.la) - # A libtool-controlled library. - - if test "$prev" = dlfiles; then - # This library was specified with -dlopen. - dlfiles="$dlfiles $arg" - prev= - elif test "$prev" = dlprefiles; then - # The library was specified with -dlpreopen. - dlprefiles="$dlprefiles $arg" - prev= - else - deplibs="$deplibs $arg" - fi - continue - ;; - - # Some other compiler argument. - *) - # Unknown arguments in both finalize_command and compile_command need - # to be aesthetically quoted because they are evaled later. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") - arg="\"$arg\"" - ;; - esac - ;; - esac # arg - - # Now actually substitute the argument into the commands. - if test -n "$arg"; then - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - done # argument parsing loop - - if test -n "$prev"; then - $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then - eval arg=\"$export_dynamic_flag_spec\" - compile_command="$compile_command $arg" - finalize_command="$finalize_command $arg" - fi - - oldlibs= - # calculate the name of the file, without its directory - outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'` - libobjs_save="$libobjs" - - if test -n "$shlibpath_var"; then - # get the directories listed in $shlibpath_var - eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\` - else - shlib_search_path= - fi - eval sys_lib_search_path=\"$sys_lib_search_path_spec\" - eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\" - - output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'` - if test "X$output_objdir" = "X$output"; then - output_objdir="$objdir" - else - output_objdir="$output_objdir/$objdir" - fi - # Create the object directory. - if test ! -d "$output_objdir"; then - $show "$mkdir $output_objdir" - $run $mkdir $output_objdir - status=$? - if test "$status" -ne 0 && test ! -d "$output_objdir"; then - exit $status - fi - fi - - # Determine the type of output - case $output in - "") - $echo "$modename: you must specify an output file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - *.$libext) linkmode=oldlib ;; - *.lo | *.$objext) linkmode=obj ;; - *.la) linkmode=lib ;; - *) linkmode=prog ;; # Anything else should be a program. - esac - - case $host in - *cygwin* | *mingw* | *pw32*) - # don't eliminate duplications in $postdeps and $predeps - duplicate_compiler_generated_deps=yes - ;; - *) - duplicate_compiler_generated_deps=$duplicate_deps - ;; - esac - specialdeplibs= - - libs= - # Find all interdependent deplibs by searching for libraries - # that are linked more than once (e.g. -la -lb -la) - for deplib in $deplibs; do - if test "X$duplicate_deps" = "Xyes" ; then - case "$libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - libs="$libs $deplib" - done - - if test "$linkmode" = lib; then - libs="$predeps $libs $compiler_lib_search_path $postdeps" - - # Compute libraries that are listed more than once in $predeps - # $postdeps and mark them as special (i.e., whose duplicates are - # not to be eliminated). - pre_post_deps= - if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then - for pre_post_dep in $predeps $postdeps; do - case "$pre_post_deps " in - *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;; - esac - pre_post_deps="$pre_post_deps $pre_post_dep" - done - fi - pre_post_deps= - fi - - deplibs= - newdependency_libs= - newlib_search_path= - need_relink=no # whether we're linking any uninstalled libtool libraries - notinst_deplibs= # not-installed libtool libraries - notinst_path= # paths that contain not-installed libtool libraries - case $linkmode in - lib) - passes="conv link" - for file in $dlfiles $dlprefiles; do - case $file in - *.la) ;; - *) - $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done - ;; - prog) - compile_deplibs= - finalize_deplibs= - alldeplibs=no - newdlfiles= - newdlprefiles= - passes="conv scan dlopen dlpreopen link" - ;; - *) passes="conv" - ;; - esac - for pass in $passes; do - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan"; then - libs="$deplibs" - deplibs= - fi - if test "$linkmode" = prog; then - case $pass in - dlopen) libs="$dlfiles" ;; - dlpreopen) libs="$dlprefiles" ;; - link) - libs="$deplibs %DEPLIBS%" - test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" - ;; - esac - fi - if test "$pass" = dlopen; then - # Collect dlpreopened libraries - save_deplibs="$deplibs" - deplibs= - fi - for deplib in $libs; do - lib= - found=no - case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - fi - continue - ;; - -l*) - if test "$linkmode" != lib && test "$linkmode" != prog; then - $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 - continue - fi - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` - for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do - for search_ext in .la $std_shrext .so .a; do - # Search the libtool library - lib="$searchdir/lib${name}${search_ext}" - if test -f "$lib"; then - if test "$search_ext" = ".la"; then - found=yes - else - found=no - fi - break 2 - fi - done - done - if test "$found" != yes; then - # deplib doesn't seem to be a libtool library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - else # deplib is a libtool library - # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib, - # We need to do some special things here, and not later. - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $deplib "*) - if (${SED} -e '2q' $lib | - grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - library_names= - old_library= - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - for l in $old_library $library_names; do - ll="$l" - done - if test "X$ll" = "X$old_library" ; then # only static version available - found=no - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - lib=$ladir/$old_library - if test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - deplibs="$deplib $deplibs" - test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" - fi - continue - fi - fi - ;; - *) ;; - esac - fi - fi - ;; # -l - -L*) - case $linkmode in - lib) - deplibs="$deplib $deplibs" - test "$pass" = conv && continue - newdependency_libs="$deplib $newdependency_libs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - prog) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - if test "$pass" = scan; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` - ;; - *) - $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 - ;; - esac # linkmode - continue - ;; # -L - -R*) - if test "$pass" = link; then - dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'` - # Make sure the xrpath contains only unique directories. - case "$xrpath " in - *" $dir "*) ;; - *) xrpath="$xrpath $dir" ;; - esac - fi - deplibs="$deplib $deplibs" - continue - ;; - *.la) lib="$deplib" ;; - *.$libext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - continue - fi - case $linkmode in - lib) - if test "$deplibs_check_method" != pass_all; then - $echo - $echo "*** Warning: Trying to link with static lib archive $deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because the file extensions .$libext of this argument makes me believe" - $echo "*** that it is just a static archive that I should not used here." - else - $echo - $echo "*** Warning: Linking the shared library $output against the" - $echo "*** static library $deplib is not portable!" - deplibs="$deplib $deplibs" - fi - continue - ;; - prog) - if test "$pass" != link; then - deplibs="$deplib $deplibs" - else - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - fi - continue - ;; - esac # linkmode - ;; # *.$libext - *.lo | *.$objext) - if test "$pass" = conv; then - deplibs="$deplib $deplibs" - elif test "$linkmode" = prog; then - if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then - # If there is no dlopen support or we're linking statically, - # we need to preload. - newdlprefiles="$newdlprefiles $deplib" - compile_deplibs="$deplib $compile_deplibs" - finalize_deplibs="$deplib $finalize_deplibs" - else - newdlfiles="$newdlfiles $deplib" - fi - fi - continue - ;; - %DEPLIBS%) - alldeplibs=yes - continue - ;; - esac # case $deplib - if test "$found" = yes || test -f "$lib"; then : - else - $echo "$modename: cannot find the library \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - - ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` - test "X$ladir" = "X$lib" && ladir="." - - dlname= - dlopen= - dlpreopen= - libdir= - library_names= - old_library= - # If the library was installed with an old release of libtool, - # it will not redefine variables installed, or shouldnotlink - installed=yes - shouldnotlink=no - - # Read the .la file - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - - if test "$linkmode,$pass" = "lib,link" || - test "$linkmode,$pass" = "prog,scan" || - { test "$linkmode" != prog && test "$linkmode" != lib; }; then - test -n "$dlopen" && dlfiles="$dlfiles $dlopen" - test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen" - fi - - if test "$pass" = conv; then - # Only check for convenience libraries - deplibs="$lib $deplibs" - if test -z "$libdir"; then - if test -z "$old_library"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # It is a libtool convenience library, so add in its objects. - convenience="$convenience $ladir/$objdir/$old_library" - old_convenience="$old_convenience $ladir/$objdir/$old_library" - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - elif test "$linkmode" != prog && test "$linkmode" != lib; then - $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit $EXIT_FAILURE - fi - continue - fi # $pass = conv - - - # Get the name of the library we link against. - linklib= - for l in $old_library $library_names; do - linklib="$l" - done - if test -z "$linklib"; then - $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - - # This library was specified with -dlopen. - if test "$pass" = dlopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - if test -z "$dlname" || - test "$dlopen_support" != yes || - test "$build_libtool_libs" = no; then - # If there is no dlname, no dlopen support or we're linking - # statically, we need to preload. We also need to preload any - # dependent libraries so libltdl's deplib preloader doesn't - # bomb out in the load deplibs phase. - dlprefiles="$dlprefiles $lib $dependency_libs" - else - newdlfiles="$newdlfiles $lib" - fi - continue - fi # $pass = dlopen - - # We need an absolute path. - case $ladir in - [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;; - *) - abs_ladir=`cd "$ladir" && pwd` - if test -z "$abs_ladir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2 - $echo "$modename: passing it literally to the linker, although it might fail" 1>&2 - abs_ladir="$ladir" - fi - ;; - esac - laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - - # Find the relevant object directory and library name. - if test "X$installed" = Xyes; then - if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then - $echo "$modename: warning: library \`$lib' was moved." 1>&2 - dir="$ladir" - absdir="$abs_ladir" - libdir="$abs_ladir" - else - dir="$libdir" - absdir="$libdir" - fi - else - dir="$ladir/$objdir" - absdir="$abs_ladir/$objdir" - # Remove this search path later - notinst_path="$notinst_path $abs_ladir" - fi # $installed = yes - name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - - # This library was specified with -dlpreopen. - if test "$pass" = dlpreopen; then - if test -z "$libdir"; then - $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit $EXIT_FAILURE - fi - # Prefer using a static library (so that no silly _DYNAMIC symbols - # are required to link). - if test -n "$old_library"; then - newdlprefiles="$newdlprefiles $dir/$old_library" - # Otherwise, use the dlname, so that lt_dlopen finds it. - elif test -n "$dlname"; then - newdlprefiles="$newdlprefiles $dir/$dlname" - else - newdlprefiles="$newdlprefiles $dir/$linklib" - fi - fi # $pass = dlpreopen - - if test -z "$libdir"; then - # Link the convenience library - if test "$linkmode" = lib; then - deplibs="$dir/$old_library $deplibs" - elif test "$linkmode,$pass" = "prog,link"; then - compile_deplibs="$dir/$old_library $compile_deplibs" - finalize_deplibs="$dir/$old_library $finalize_deplibs" - else - deplibs="$lib $deplibs" # used for prog,scan pass - fi - continue - fi - - - if test "$linkmode" = prog && test "$pass" != link; then - newlib_search_path="$newlib_search_path $ladir" - deplibs="$lib $deplibs" - - linkalldeplibs=no - if test "$link_all_deplibs" != no || test -z "$library_names" || - test "$build_libtool_libs" = no; then - linkalldeplibs=yes - fi - - tmp_libs= - for deplib in $dependency_libs; do - case $deplib in - -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test - esac - # Need to link against all dependency_libs? - if test "$linkalldeplibs" = yes; then - deplibs="$deplib $deplibs" - else - # Need to hardcode shared library paths - # or/and link against static libraries - newdependency_libs="$deplib $newdependency_libs" - fi - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done # for deplib - continue - fi # $linkmode = prog... - - if test "$linkmode,$pass" = "prog,link"; then - 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 - # Make sure the rpath contains only unique directories. - case "$temp_rpath " in - *" $dir "*) ;; - *" $absdir "*) ;; - *) temp_rpath="$temp_rpath $dir" ;; - esac - fi - - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi # $linkmode,$pass = prog,link... - - if test "$alldeplibs" = yes && - { test "$deplibs_check_method" = pass_all || - { test "$build_libtool_libs" = yes && - test -n "$library_names"; }; }; then - # We only need to search for static libraries - continue - fi - fi - - link_static=no # Whether the deplib will be linked statically - if test -n "$library_names" && - { test "$prefer_static_libs" = no || test -z "$old_library"; }; then - if test "$installed" = no; then - notinst_deplibs="$notinst_deplibs $lib" - need_relink=yes - fi - # This is a shared library - - # Warn about portability, can't link against -module's on - # some systems (darwin) - if test "$shouldnotlink" = yes && test "$pass" = link ; then - $echo - if test "$linkmode" = prog; then - $echo "*** Warning: Linking the executable $output against the loadable module" - else - $echo "*** Warning: Linking the shared library $output against the loadable module" - fi - $echo "*** $linklib is not portable!" - fi - if test "$linkmode" = lib && - test "$hardcode_into_libs" = yes; then - # Hardcode the library path. - # Skip directories that are in the system default run-time - # search path. - case " $sys_lib_dlsearch_path " in - *" $absdir "*) ;; - *) - case "$compile_rpath " in - *" $absdir "*) ;; - *) compile_rpath="$compile_rpath $absdir" - esac - ;; - esac - case " $sys_lib_dlsearch_path " in - *" $libdir "*) ;; - *) - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" - esac - ;; - esac - fi - - if test -n "$old_archive_from_expsyms_cmds"; then - # figure out the soname - set dummy $library_names - realname="$2" - shift; shift - libname=`eval \\$echo \"$libname_spec\"` - # use dlname if we got it. it's perfectly good, no? - if test -n "$dlname"; then - soname="$dlname" - elif test -n "$soname_spec"; then - # bleh windows - case $host in - *cygwin* | mingw*) - major=`expr $current - $age` - versuffix="-$major" - ;; - esac - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - - # Make a new name for the extract_expsyms_cmds to use - soroot="$soname" - soname=`$echo $soroot | ${SED} -e 's/^.*\///'` - newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a" - - # If the library has no export list, then create one now - if test -f "$output_objdir/$soname-def"; then : - else - $show "extracting exported symbol list from \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$extract_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Create $newlib - if test -f "$output_objdir/$newlib"; then :; else - $show "generating import library for \`$soname'" - save_ifs="$IFS"; IFS='~' - cmds=$old_archive_from_expsyms_cmds - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - # make sure the library variables are pointing to the new library - dir=$output_objdir - linklib=$newlib - fi # test -n "$old_archive_from_expsyms_cmds" - - if test "$linkmode" = prog || test "$mode" != relink; then - add_shlibpath= - add_dir= - add= - lib_linked=yes - case $hardcode_action in - immediate | unsupported) - if test "$hardcode_direct" = no; then - add="$dir/$linklib" - case $host in - *-*-sco3.2v5* ) add_dir="-L$dir" ;; - *-*-darwin* ) - # if the lib is a module then we can not link against - # it, someone is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then - $echo "** Warning, lib $linklib is a module, not a shared library" - if test -z "$old_library" ; then - $echo - $echo "** And there doesn't seem to be a static archive available" - $echo "** The link will probably fail, sorry" - else - add="$dir/$old_library" - fi - fi - esac - elif test "$hardcode_minus_L" = no; then - case $host in - *-*-sunos*) add_shlibpath="$dir" ;; - esac - add_dir="-L$dir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = no; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - relink) - if test "$hardcode_direct" = yes; then - add="$dir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case "$libdir" in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - add_shlibpath="$dir" - add="-l$name" - else - lib_linked=no - fi - ;; - *) lib_linked=no ;; - esac - - if test "$lib_linked" != yes; then - $echo "$modename: configuration error: unsupported hardcode properties" - exit $EXIT_FAILURE - fi - - if test -n "$add_shlibpath"; then - case :$compile_shlibpath: in - *":$add_shlibpath:"*) ;; - *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;; - esac - fi - if test "$linkmode" = prog; then - test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs" - test -n "$add" && compile_deplibs="$add $compile_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - if test "$hardcode_direct" != yes && \ - test "$hardcode_minus_L" != yes && \ - test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - fi - fi - fi - - if test "$linkmode" = prog || test "$mode" = relink; then - add_shlibpath= - add_dir= - add= - # Finalize command for both is simple: just hardcode it. - if test "$hardcode_direct" = yes; then - add="$libdir/$linklib" - elif test "$hardcode_minus_L" = yes; then - add_dir="-L$libdir" - add="-l$name" - elif test "$hardcode_shlibpath_var" = yes; then - case :$finalize_shlibpath: in - *":$libdir:"*) ;; - *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;; - esac - add="-l$name" - elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && - test -f "$inst_prefix_dir$libdir/$linklib" ; then - add="$inst_prefix_dir$libdir/$linklib" - else - add="$libdir/$linklib" - fi - else - # We cannot seem to hardcode it, guess we'll fake it. - add_dir="-L$libdir" - # Try looking first in the location we're being installed to. - if test -n "$inst_prefix_dir"; then - case "$libdir" in - [\\/]*) - add_dir="$add_dir -L$inst_prefix_dir$libdir" - ;; - esac - fi - add="-l$name" - fi - - if test "$linkmode" = prog; then - test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs" - test -n "$add" && finalize_deplibs="$add $finalize_deplibs" - else - test -n "$add_dir" && deplibs="$add_dir $deplibs" - test -n "$add" && deplibs="$add $deplibs" - fi - fi - elif test "$linkmode" = prog; then - # Here we assume that one of hardcode_direct or hardcode_minus_L - # is not unsupported. This is valid on all known static and - # shared platforms. - if test "$hardcode_direct" != unsupported; then - test -n "$old_library" && linklib="$old_library" - compile_deplibs="$dir/$linklib $compile_deplibs" - finalize_deplibs="$dir/$linklib $finalize_deplibs" - else - compile_deplibs="-l$name -L$dir $compile_deplibs" - finalize_deplibs="-l$name -L$dir $finalize_deplibs" - fi - elif test "$build_libtool_libs" = yes; then - # Not a shared library - if test "$deplibs_check_method" != pass_all; then - # We're trying link a shared library against a static one - # but the system doesn't support it. - - # Just print a warning and add the library to dependency_libs so - # that the program can be linked against the static library. - $echo - $echo "*** Warning: This system can not link to static lib archive $lib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have." - if test "$module" = yes; then - $echo "*** But as you try to build a module library, libtool will still create " - $echo "*** a static module, that should work as long as the dlopening application" - $echo "*** is linked with the -dlopen flag to resolve symbols at runtime." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - else - convenience="$convenience $dir/$old_library" - old_convenience="$old_convenience $dir/$old_library" - deplibs="$dir/$old_library $deplibs" - link_static=yes - fi - fi # link shared/static library? - - if test "$linkmode" = lib; then - if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || - test "$build_old_libs" = yes || - test "$link_static" = yes; }; then - # Extract -R from dependency_libs - temp_deplibs= - for libdir in $dependency_libs; do - case $libdir in - -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'` - case " $xrpath " in - *" $temp_xrpath "*) ;; - *) xrpath="$xrpath $temp_xrpath";; - esac;; - *) temp_deplibs="$temp_deplibs $libdir";; - esac - done - dependency_libs="$temp_deplibs" - fi - - newlib_search_path="$newlib_search_path $absdir" - # Link against this library - test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs" - # ... and its dependency_libs - tmp_libs= - for deplib in $dependency_libs; do - newdependency_libs="$deplib $newdependency_libs" - if test "X$duplicate_deps" = "Xyes" ; then - case "$tmp_libs " in - *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;; - esac - fi - tmp_libs="$tmp_libs $deplib" - done - - if test "$link_all_deplibs" != no; then - # Add the search paths of all dependency libraries - for deplib in $dependency_libs; do - case $deplib in - -L*) path="$deplib" ;; - *.la) - dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$deplib" && dir="." - # We need an absolute path. - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;; - *) - absdir=`cd "$dir" && pwd` - if test -z "$absdir"; then - $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2 - absdir="$dir" - fi - ;; - esac - if grep "^installed=no" $deplib > /dev/null; then - path="$absdir/$objdir" - else - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - if test "$absdir" != "$libdir"; then - $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 - fi - path="$absdir" - fi - depdepl= - case $host in - *-*-darwin*) - # we do not want to link against static libs, - # but need to link against shared - eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` - if test -n "$deplibrary_names" ; then - for tmp in $deplibrary_names ; do - depdepl=$tmp - done - if test -f "$path/$depdepl" ; then - depdepl="$path/$depdepl" - fi - # do not add paths which are already there - case " $newlib_search_path " in - *" $path "*) ;; - *) newlib_search_path="$newlib_search_path $path";; - esac - fi - path="" - ;; - *) - path="-L$path" - ;; - esac - ;; - -l*) - case $host in - *-*-darwin*) - # Again, we only want to link against shared libraries - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` - for tmp in $newlib_search_path ; do - if test -f "$tmp/lib$tmp_libs.dylib" ; then - eval depdepl="$tmp/lib$tmp_libs.dylib" - break - fi - done - path="" - ;; - *) continue ;; - esac - ;; - *) continue ;; - esac - case " $deplibs " in - *" $depdepl "*) ;; - *) deplibs="$depdepl $deplibs" ;; - esac - case " $deplibs " in - *" $path "*) ;; - *) deplibs="$deplibs $path" ;; - esac - done - fi # link_all_deplibs != no - fi # linkmode = lib - done # for deplib in $libs - dependency_libs="$newdependency_libs" - if test "$pass" = dlpreopen; then - # Link the dlpreopened libraries before other libraries - for deplib in $save_deplibs; do - deplibs="$deplib $deplibs" - done - fi - if test "$pass" != dlopen; then - if test "$pass" != conv; then - # Make sure lib_search_path contains only unique directories. - lib_search_path= - for dir in $newlib_search_path; do - case "$lib_search_path " in - *" $dir "*) ;; - *) lib_search_path="$lib_search_path $dir" ;; - esac - done - newlib_search_path= - fi - - if test "$linkmode,$pass" != "prog,link"; then - vars="deplibs" - else - vars="compile_deplibs finalize_deplibs" - fi - for var in $vars dependency_libs; do - # Add libraries to $var in reverse order - eval tmp_libs=\"\$$var\" - new_libs= - for deplib in $tmp_libs; do - # FIXME: Pedantically, this is the right thing to do, so - # that some nasty dependency loop isn't accidentally - # broken: - #new_libs="$deplib $new_libs" - # Pragmatically, this seems to cause very few problems in - # practice: - case $deplib in - -L*) new_libs="$deplib $new_libs" ;; - -R*) ;; - *) - # And here is the reason: when a library appears more - # than once as an explicit dependence of a library, or - # is implicitly linked in more than once by the - # compiler, it is considered special, and multiple - # occurrences thereof are not removed. Compare this - # with having the same library being listed as a - # dependency of multiple other libraries: in this case, - # we know (pedantically, we assume) the library does not - # need to be listed more than once, so we keep only the - # last copy. This is not always right, but it is rare - # enough that we require users that really mean to play - # such unportable linking tricks to link the library - # using -Wl,-lname, so that libtool does not consider it - # for duplicate removal. - case " $specialdeplibs " in - *" $deplib "*) new_libs="$deplib $new_libs" ;; - *) - case " $new_libs " in - *" $deplib "*) ;; - *) new_libs="$deplib $new_libs" ;; - esac - ;; - esac - ;; - esac - done - tmp_libs= - for deplib in $new_libs; do - case $deplib in - -L*) - case " $tmp_libs " in - *" $deplib "*) ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - ;; - *) tmp_libs="$tmp_libs $deplib" ;; - esac - done - eval $var=\"$tmp_libs\" - done # for var - fi - # Last step: remove runtime libs from dependency_libs - # (they stay in deplibs) - tmp_libs= - for i in $dependency_libs ; do - case " $predeps $postdeps $compiler_lib_search_path " in - *" $i "*) - i="" - ;; - esac - if test -n "$i" ; then - tmp_libs="$tmp_libs $i" - fi - done - dependency_libs=$tmp_libs - done # for pass - if test "$linkmode" = prog; then - dlfiles="$newdlfiles" - dlprefiles="$newdlprefiles" - fi - - case $linkmode in - oldlib) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2 - fi - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2 - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2 - fi - - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for archives" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for archives" 1>&2 - fi - - if test -n "$export_symbols" || test -n "$export_symbols_regex"; then - $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2 - fi - - # Now set the variables for building old libraries. - build_libtool_libs=no - oldlibs="$output" - objs="$objs$old_deplibs" - ;; - - lib) - # Make sure we only generate libraries of the form `libNAME.la'. - case $outputname in - lib*) - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - ;; - *) - if test "$module" = no; then - $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - if test "$need_lib_prefix" != no; then - # Add the "lib" prefix for modules if required - name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - eval shared_ext=\"$shrext_cmds\" - eval libname=\"$libname_spec\" - else - libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - fi - ;; - esac - - if test -n "$objs"; then - if test "$deplibs_check_method" != pass_all; then - $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 - exit $EXIT_FAILURE - else - $echo - $echo "*** Warning: Linking the shared library $output against the non-libtool" - $echo "*** objects $objs is not portable!" - libobjs="$libobjs $objs" - fi - fi - - if test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2 - fi - - set dummy $rpath - if test "$#" -gt 2; then - $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2 - fi - install_libdir="$2" - - oldlibs= - if test -z "$rpath"; then - if test "$build_libtool_libs" = yes; then - # Building a libtool convenience library. - # Some compilers have problems with a `.al' extension so - # convenience libraries should have the same extension an - # archive normally would. - oldlibs="$output_objdir/$libname.$libext $oldlibs" - build_libtool_libs=convenience - build_old_libs=yes - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2 - fi - else - - # Parse the version information argument. - save_ifs="$IFS"; IFS=':' - set dummy $vinfo 0 0 0 - IFS="$save_ifs" - - if test -n "$8"; then - $echo "$modename: too many parameters to \`-version-info'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # convert absolute version numbers to libtool ages - # this retains compatibility with .la files and attempts - # to make the code below a bit more comprehensible - - case $vinfo_number in - yes) - number_major="$2" - number_minor="$3" - number_revision="$4" - # - # There are really only two kinds -- those that - # use the current revision as the major version - # and those that subtract age and use age as - # a minor version. But, then there is irix - # which has an extra 1 added just for fun - # - case $version_type in - darwin|linux|osf|windows) - current=`expr $number_major + $number_minor` - age="$number_minor" - revision="$number_revision" - ;; - freebsd-aout|freebsd-elf|sunos) - current="$number_major" - revision="$number_minor" - age="0" - ;; - irix|nonstopux) - current=`expr $number_major + $number_minor - 1` - age="$number_minor" - revision="$number_minor" - ;; - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac - ;; - no) - current="$2" - revision="$3" - age="$4" - ;; - esac - - # Check that each of the things are valid numbers. - case $current in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; - *) - $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - case $revision in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; - *) - $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - case $age in - 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;; - *) - $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - if test "$age" -gt "$current"; then - $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 - $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit $EXIT_FAILURE - fi - - # Calculate the version variables. - major= - versuffix= - verstring= - case $version_type in - none) ;; - - darwin) - # Like Linux, but with the current version available in - # verstring for coding it into the library header - major=.`expr $current - $age` - 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" - ;; - - freebsd-aout) - major=".$current" - versuffix=".$current.$revision"; - ;; - - freebsd-elf) - major=".$current" - versuffix=".$current"; - ;; - - irix | nonstopux) - major=`expr $current - $age + 1` - - case $version_type in - nonstopux) verstring_prefix=nonstopux ;; - *) verstring_prefix=sgi ;; - esac - verstring="$verstring_prefix$major.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$revision - while test "$loop" -ne 0; do - iface=`expr $revision - $loop` - loop=`expr $loop - 1` - verstring="$verstring_prefix$major.$iface:$verstring" - done - - # Before this point, $major must not contain `.'. - major=.$major - versuffix="$major.$revision" - ;; - - linux) - major=.`expr $current - $age` - versuffix="$major.$age.$revision" - ;; - - osf) - major=.`expr $current - $age` - versuffix=".$current.$age.$revision" - verstring="$current.$age.$revision" - - # Add in all the interfaces that we are compatible with. - loop=$age - while test "$loop" -ne 0; do - iface=`expr $current - $loop` - loop=`expr $loop - 1` - verstring="$verstring:${iface}.0" - done - - # Make executables depend on our current version. - verstring="$verstring:${current}.0" - ;; - - sunos) - major=".$current" - versuffix=".$current.$revision" - ;; - - windows) - # Use '-' rather than '.', since we only want one - # extension on DOS 8.3 filesystems. - major=`expr $current - $age` - versuffix="-$major" - ;; - - *) - $echo "$modename: unknown library version type \`$version_type'" 1>&2 - $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Clear the version info if we defaulted, and they specified a release. - if test -z "$vinfo" && test -n "$release"; then - major= - case $version_type in - darwin) - # we can't check for "0.0" in archive_cmds due to quoting - # problems, so we reset it completely - verstring= - ;; - *) - verstring="0.0" - ;; - esac - if test "$need_version" = no; then - versuffix= - else - versuffix=".0.0" - fi - fi - - # Remove version info from name if versioning should be avoided - if test "$avoid_version" = yes && test "$need_version" = no; then - major= - versuffix= - verstring="" - fi - - # Check to see if the archive will have undefined symbols. - if test "$allow_undefined" = yes; then - if test "$allow_undefined_flag" = unsupported; then - $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2 - build_libtool_libs=no - build_old_libs=yes - fi - else - # Don't allow undefined symbols. - allow_undefined_flag="$no_undefined_flag" - fi - fi - - if test "$mode" != relink; then - # Remove our outputs, but don't remove object files since they - # may have been created when compiling PIC objects. - removelist= - tempremovelist=`$echo "$output_objdir/*"` - for p in $tempremovelist; do - case $p in - *.$objext) - ;; - $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) - if test "X$precious_files_regex" != "X"; then - if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 - then - continue - fi - fi - removelist="$removelist $p" - ;; - *) ;; - esac - done - if test -n "$removelist"; then - $show "${rm}r $removelist" - $run ${rm}r $removelist - fi - fi - - # Now set the variables for building old libraries. - if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then - oldlibs="$oldlibs $output_objdir/$libname.$libext" - - # Transform .lo files to .o files. - oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP` - fi - - # Eliminate all temporary directories. - for path in $notinst_path; do - lib_search_path=`$echo "$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 - # If the user specified any rpath flags, then add them. - temp_xrpath= - for libdir in $xrpath; do - temp_xrpath="$temp_xrpath -R$libdir" - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then - dependency_libs="$temp_xrpath $dependency_libs" - fi - fi - - # Make sure dlfiles contains only unique files that won't be dlpreopened - old_dlfiles="$dlfiles" - dlfiles= - for lib in $old_dlfiles; do - case " $dlprefiles $dlfiles " in - *" $lib "*) ;; - *) dlfiles="$dlfiles $lib" ;; - esac - done - - # Make sure dlprefiles contains only unique files - old_dlprefiles="$dlprefiles" - dlprefiles= - for lib in $old_dlprefiles; do - case "$dlprefiles " in - *" $lib "*) ;; - *) dlprefiles="$dlprefiles $lib" ;; - esac - done - - if test "$build_libtool_libs" = yes; then - if test -n "$rpath"; then - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*) - # these systems don't actually have a c library (as such)! - ;; - *-*-rhapsody* | *-*-darwin1.[012]) - # Rhapsody C library is in the System framework - deplibs="$deplibs -framework System" - ;; - *-*-netbsd*) - # Don't link with libc until the a.out ld.so is fixed. - ;; - *-*-openbsd* | *-*-freebsd*) - # Do not include libc due to us having libc/libc_r. - test "X$arg" = "X-lc" && continue - ;; - *) - # Add libc to deplibs on all other systems if necessary. - if test "$build_libtool_need_lc" = "yes"; then - deplibs="$deplibs -lc" - fi - ;; - esac - fi - - # Transform deplibs into only deplibs that can be linked in shared. - name_save=$name - libname_save=$libname - release_save=$release - versuffix_save=$versuffix - major_save=$major - # I'm not sure if I'm treating the release correctly. I think - # release should show up in the -l (ie -lgmp5) so we don't want to - # add it in twice. Is that correct? - release="" - versuffix="" - major="" - newdeplibs= - droppeddeps=no - case $deplibs_check_method in - pass_all) - # Don't check for shared/static. Everything works. - # This might be a little naive. We might want to check - # whether the library exists or not. But this is on - # osf3 & osf4 and I'm not really sure... Just - # implementing what was already the behavior. - newdeplibs=$deplibs - ;; - test_compile) - # This code stresses the "libraries are programs" paradigm to its - # limits. Maybe even breaks it. We compile a program, linking it - # against the deplibs as a proxy for the library. Then we can check - # whether they linked in statically or dynamically with ldd. - $rm conftest.c - cat > conftest.c </dev/null` - for potent_lib in $potential_libs; do - # Follow soft links. - if ls -lLd "$potent_lib" 2>/dev/null \ - | grep " -> " >/dev/null; then - continue - fi - # The statement above tries to avoid entering an - # endless loop below, in case of cyclic links. - # We might still enter an endless loop, since a link - # loop can be closed while we follow links, - # but so what? - potlib="$potent_lib" - while test -h "$potlib" 2>/dev/null; do - potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'` - case $potliblink in - [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";; - *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";; - esac - done - if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$file_magic_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for file magic test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a file magic. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - match_pattern*) - set dummy $deplibs_check_method - match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"` - for a_deplib in $deplibs; do - name="`expr $a_deplib : '-l\(.*\)'`" - # If $name is empty we are operating on a -L argument. - if test -n "$name" && test "$name" != "0"; then - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - case " $predeps $postdeps " in - *" $a_deplib "*) - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - ;; - esac - fi - if test -n "$a_deplib" ; then - libname=`eval \\$echo \"$libname_spec\"` - for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do - potential_libs=`ls $i/$libname[.-]* 2>/dev/null` - for potent_lib in $potential_libs; do - potlib="$potent_lib" # see symlink-check above in file_magic test - if eval $echo \"$potent_lib\" 2>/dev/null \ - | ${SED} 10q \ - | $EGREP "$match_pattern_regex" > /dev/null; then - newdeplibs="$newdeplibs $a_deplib" - a_deplib="" - break 2 - fi - done - done - fi - if test -n "$a_deplib" ; then - droppeddeps=yes - $echo - $echo "*** Warning: linker path does not have real file for library $a_deplib." - $echo "*** I have the capability to make that library automatically link in when" - $echo "*** you link to this library. But I can only do this if you have a" - $echo "*** shared version of the library, which you do not appear to have" - $echo "*** because I did check the linker path looking for a file starting" - if test -z "$potlib" ; then - $echo "*** with $libname but no candidates were found. (...for regex pattern test)" - else - $echo "*** with $libname and none of the candidates passed a file format test" - $echo "*** using a regex pattern. Last file checked: $potlib" - fi - fi - else - # Add a -L argument. - newdeplibs="$newdeplibs $a_deplib" - fi - done # Gone through all deplibs. - ;; - none | unknown | *) - newdeplibs="" - tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \ - -e 's/ -[LR][^ ]*//g'` - if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then - for i in $predeps $postdeps ; do - # can't use Xsed below, because $i might contain '/' - tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"` - done - fi - if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \ - | grep . >/dev/null; then - $echo - if test "X$deplibs_check_method" = "Xnone"; then - $echo "*** Warning: inter-library dependencies are not supported in this platform." - else - $echo "*** Warning: inter-library dependencies are not known to be supported." - fi - $echo "*** All declared inter-library dependencies are being dropped." - droppeddeps=yes - fi - ;; - esac - versuffix=$versuffix_save - major=$major_save - release=$release_save - libname=$libname_save - name=$name_save - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac - - if test "$droppeddeps" = yes; then - if test "$module" = yes; then - $echo - $echo "*** Warning: libtool could not satisfy all declared inter-library" - $echo "*** dependencies of module $libname. Therefore, libtool will create" - $echo "*** a static module, that should work as long as the dlopening" - $echo "*** application is linked with the -dlopen flag." - if test -z "$global_symbol_pipe"; then - $echo - $echo "*** However, this would only work if libtool was able to extract symbol" - $echo "*** lists from a program, using \`nm' or equivalent, but libtool could" - $echo "*** not find such a program. So, this module is probably useless." - $echo "*** \`nm' from GNU binutils and a full rebuild may help." - fi - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - else - $echo "*** The inter-library dependencies that have been dropped here will be" - $echo "*** automatically added whenever a program is linked with this library" - $echo "*** or is declared to -dlopen it." - - if test "$allow_undefined" = no; then - $echo - $echo "*** Since this library must not contain undefined symbols," - $echo "*** because either the platform does not support them or" - $echo "*** it was explicitly requested with -no-undefined," - $echo "*** libtool will only create a static version of it." - if test "$build_old_libs" = no; then - oldlibs="$output_objdir/$libname.$libext" - build_libtool_libs=module - build_old_libs=yes - else - build_libtool_libs=no - fi - fi - fi - fi - # Done checking deplibs! - deplibs=$newdeplibs - fi - - # All the library-specific variables (install_libdir is set above). - library_names= - old_library= - dlname= - - # Test again, we may have decided not to build it any more - if test "$build_libtool_libs" = yes; then - if test "$hardcode_into_libs" = yes; then - # Hardcode the library paths - hardcode_libdirs= - dep_rpath= - rpath="$finalize_rpath" - test "$mode" != relink && rpath="$compile_rpath$rpath" - for libdir in $rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - dep_rpath="$dep_rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi - fi - if test -n "$runpath_var" && test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var" - fi - test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs" - fi - - shlibpath="$finalize_shlibpath" - test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath" - if test -n "$shlibpath"; then - eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var" - fi - - # Get the real and link names of the library. - eval shared_ext=\"$shrext_cmds\" - eval library_names=\"$library_names_spec\" - set dummy $library_names - realname="$2" - shift; shift - - if test -n "$soname_spec"; then - eval soname=\"$soname_spec\" - else - soname="$realname" - fi - if test -z "$dlname"; then - dlname=$soname - fi - - lib="$output_objdir/$realname" - for link - do - linknames="$linknames $link" - done - - # Use standard objects if they are pic - test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - cmds=$export_symbols_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - if len=`expr "X$cmd" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - $show "$cmd" - $run eval "$cmd" || exit $? - skipped_export=false - else - # The command line is too long to execute in one step. - $show "using reloadable object file for export list..." - skipped_export=: - fi - done - IFS="$save_ifs" - if test -n "$export_symbols_regex"; then - $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\"" - $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"' - $show "$mv \"${export_symbols}T\" \"$export_symbols\"" - $run eval '$mv "${export_symbols}T" "$export_symbols"' - fi - fi - fi - - if test -n "$export_symbols" && test -n "$include_expsyms"; then - $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"' - fi - - tmp_deplibs= - for test_deplib in $deplibs; do - case " $convenience " in - *" $test_deplib "*) ;; - *) - tmp_deplibs="$tmp_deplibs $test_deplib" - ;; - esac - done - deplibs="$tmp_deplibs" - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - else - gentop="$output_objdir/${outputname}x" - $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 - fi - fi - - if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then - eval flag=\"$thread_safe_flag_spec\" - linker_flags="$linker_flags $flag" - fi - - # Make a backup of the uninstalled library when relinking - if test "$mode" = relink; then - $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $? - fi - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval test_cmds=\"$module_expsym_cmds\" - cmds=$module_expsym_cmds - else - eval test_cmds=\"$module_cmds\" - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval test_cmds=\"$archive_expsym_cmds\" - cmds=$archive_expsym_cmds - else - eval test_cmds=\"$archive_cmds\" - cmds=$archive_cmds - fi - fi - - if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : - else - # The command line is too long to link in one step, link piecewise. - $echo "creating reloadable object files..." - - # Save the value of $output and $libobjs because we want to - # use them later. If we have whole_archive_flag_spec, we - # want to use save_libobjs as it was before - # whole_archive_flag_spec was expanded, because we can't - # assume the linker understands whole_archive_flag_spec. - # This may have to be revisited, in case too many - # convenience libraries get linked in and end up exceeding - # the spec. - if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then - save_libobjs=$libobjs - fi - save_output=$output - - # Clear the reloadable object creation command queue and - # initialize k to one. - test_cmds= - concat_cmds= - objlist= - delfiles= - last_robj= - k=1 - output=$output_objdir/$save_output-${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" : ".*"` && - test "$len" -le "$max_cmd_len"; }; then - objlist="$objlist $obj" - else - # The command $test_cmds is almost too long, add a - # command to the queue. - if test "$k" -eq 1 ; then - # The first file doesn't have a previous command to add. - eval concat_cmds=\"$reload_cmds $objlist $last_robj\" - else - # All subsequent reloadable object files will link in - # the last one created. - eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\" - fi - last_robj=$output_objdir/$save_output-${k}.$objext - k=`expr $k + 1` - output=$output_objdir/$save_output-${k}.$objext - objlist=$obj - len=1 - fi - done - # Handle the remaining objects by creating one last - # reloadable object file. All subsequent reloadable object - # files will link in the last one created. - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\" - - if ${skipped_export-false}; then - $show "generating symbol list for \`$libname.la'" - export_symbols="$output_objdir/$libname.exp" - $run $rm $export_symbols - libobjs=$output - # Append the command to create the export file. - eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\" - fi - - # Set up a command to remove the reloadale 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" - done - - $echo "creating a temporary reloadable object file: $output" - - # Loop through the commands generated above and execute them. - save_ifs="$IFS"; IFS='~' - for cmd in $concat_cmds; do - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - libobjs=$output - # Restore the value of output. - output=$save_output - - if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then - eval libobjs=\"\$libobjs $whole_archive_flag_spec\" - fi - # Expand the library linking commands again to reset the - # value of $libobjs for piecewise linking. - - # Do each of the archive commands. - if test "$module" = yes && test -n "$module_cmds" ; then - if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - cmds=$module_expsym_cmds - else - cmds=$module_cmds - fi - else - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - cmds=$archive_expsym_cmds - else - cmds=$archive_cmds - fi - fi - - # Append the command to remove the reloadable object files - # to the just-reset $cmds. - eval cmds=\"\$cmds~\$rm $delfiles\" - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || 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 $? - exit $EXIT_SUCCESS - fi - - # Create links to the real library. - for linkname in $linknames; do - if test "$realname" != "$linkname"; then - $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)" - $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $? - fi - done - - # If -module or -export-dynamic was specified, set the dlname. - if test "$module" = yes || test "$export_dynamic" = yes; then - # On all known operating systems, these are identical. - dlname="$soname" - fi - fi - ;; - - obj) - if test -n "$deplibs"; then - $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2 - fi - - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2 - fi - - if test -n "$rpath"; then - $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2 - fi - - if test -n "$xrpath"; then - $echo "$modename: warning: \`-R' is ignored for objects" 1>&2 - fi - - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for objects" 1>&2 - fi - - case $output in - *.lo) - if test -n "$objs$old_deplibs"; then - $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit $EXIT_FAILURE - fi - libobj="$output" - obj=`$echo "X$output" | $Xsed -e "$lo2o"` - ;; - *) - libobj= - obj="$output" - ;; - esac - - # Delete the old objects. - $run $rm $obj $libobj - - # Objects from convenience libraries. This assumes - # single-version convenience libraries. Whenever we create - # different ones for PIC/non-PIC, this we'll have to duplicate - # the extraction. - reload_conv_objs= - gentop= - # reload_cmds runs $LD directly, so let us get rid of - # -Wl from whole_archive_flag_spec - wl= - - if test -n "$convenience"; then - if test -n "$whole_archive_flag_spec"; then - 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 - fi - fi - - # Create the old-style object. - reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test - - output="$obj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - - # Exit if we aren't doing a library object file. - if test -z "$libobj"; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - exit $EXIT_SUCCESS - fi - - if test "$build_libtool_libs" != yes; then - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - # Create an invalid libtool object if no PIC, so that we don't - # accidentally link it into a program. - # $show "echo timestamp > $libobj" - # $run eval "echo timestamp > $libobj" || exit $? - exit $EXIT_SUCCESS - fi - - if test -n "$pic_flag" || test "$pic_mode" != default; then - # Only do commands if we really have different PIC objects. - reload_objs="$libobjs $reload_conv_objs" - output="$libobj" - cmds=$reload_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - if test -n "$gentop"; then - $show "${rm}r $gentop" - $run ${rm}r $gentop - fi - - exit $EXIT_SUCCESS - ;; - - prog) - case $host in - *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;; - esac - if test -n "$vinfo"; then - $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2 - fi - - if test -n "$release"; then - $echo "$modename: warning: \`-release' is ignored for programs" 1>&2 - fi - - if test "$preload" = yes; then - if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown && - test "$dlopen_self_static" = unknown; then - $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support." - fi - fi - - case $host in - *-*-rhapsody* | *-*-darwin1.[012]) - # On Rhapsody replace the C library is the System framework - compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'` - ;; - esac - - case $host in - *darwin*) - # Don't allow lazy linking, it breaks C++ global constructors - if test "$tagname" = CXX ; then - compile_command="$compile_command ${wl}-bind_at_load" - finalize_command="$finalize_command ${wl}-bind_at_load" - fi - ;; - esac - - compile_command="$compile_command $compile_deplibs" - finalize_command="$finalize_command $finalize_deplibs" - - if test -n "$rpath$xrpath"; then - # If the user specified any rpath flags, then add them. - for libdir in $rpath $xrpath; do - # This is the magic to use -rpath. - case "$finalize_rpath " in - *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; - esac - done - fi - - # Now hardcode the library paths - rpath= - hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$perm_rpath " in - *" $libdir "*) ;; - *) perm_rpath="$perm_rpath $libdir" ;; - esac - fi - case $host in - *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*) - case :$dllsearchpath: in - *":$libdir:"*) ;; - *) dllsearchpath="$dllsearchpath:$libdir";; - esac - ;; - esac - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - compile_rpath="$rpath" - - rpath= - hardcode_libdirs= - for libdir in $finalize_rpath; do - if test -n "$hardcode_libdir_flag_spec"; then - if test -n "$hardcode_libdir_separator"; then - if test -z "$hardcode_libdirs"; then - hardcode_libdirs="$libdir" - else - # Just accumulate the unique libdirs. - case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in - *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*) - ;; - *) - hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir" - ;; - esac - fi - else - eval flag=\"$hardcode_libdir_flag_spec\" - rpath="$rpath $flag" - fi - elif test -n "$runpath_var"; then - case "$finalize_perm_rpath " in - *" $libdir "*) ;; - *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;; - esac - fi - done - # Substitute the hardcoded libdirs into the rpath. - if test -n "$hardcode_libdir_separator" && - test -n "$hardcode_libdirs"; then - libdir="$hardcode_libdirs" - eval rpath=\" $hardcode_libdir_flag_spec\" - fi - finalize_rpath="$rpath" - - if test -n "$libobjs" && test "$build_old_libs" = yes; then - # Transform all the library objects into standard objects. - compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - fi - - dlsyms= - if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then - if test -n "$NM" && test -n "$global_symbol_pipe"; then - dlsyms="${outputname}S.c" - else - $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2 - fi - fi - - if test -n "$dlsyms"; then - case $dlsyms in - "") ;; - *.c) - # Discover the nlist of each of the dlfiles. - nlist="$output_objdir/${outputname}.nm" - - $show "$rm $nlist ${nlist}S ${nlist}T" - $run $rm "$nlist" "${nlist}S" "${nlist}T" - - # Parse the name list into a source file. - $show "creating $output_objdir/$dlsyms" - - test -z "$run" && $echo > "$output_objdir/$dlsyms" "\ -/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */ -/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */ - -#ifdef __cplusplus -extern \"C\" { -#endif - -/* Prevent the only kind of declaration conflicts we can make. */ -#define lt_preloaded_symbols some_other_symbol - -/* External symbol declarations for the compiler. */\ -" - - if test "$dlself" = yes; then - $show "generating symbol list for \`$output'" - - test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist" - - # Add our own program objects to the symbol list. - progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP` - for arg in $progfiles; do - $show "extracting global C symbols from \`$arg'" - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -n "$exclude_expsyms"; then - $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - if test -n "$export_symbols_regex"; then - $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T' - $run eval '$mv "$nlist"T "$nlist"' - fi - - # Prepare the list of exported symbols - if test -z "$export_symbols"; then - export_symbols="$output_objdir/$output.exp" - $run $rm $export_symbols - $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"' - 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 'mv "$nlist"T "$nlist"' - fi - fi - - for arg in $dlprefiles; do - $show "extracting global C symbols from \`$arg'" - name=`$echo "$arg" | ${SED} -e 's%^.*/%%'` - $run eval '$echo ": $name " >> "$nlist"' - $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'" - done - - if test -z "$run"; then - # Make sure we have at least an empty file. - test -f "$nlist" || : > "$nlist" - - if test -n "$exclude_expsyms"; then - $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T - $mv "$nlist"T "$nlist" - fi - - # Try sorting and uniquifying the output. - if grep -v "^: " < "$nlist" | - if sort -k 3 /dev/null 2>&1; then - sort -k 3 - else - sort +2 - fi | - uniq > "$nlist"S; then - : - else - grep -v "^: " < "$nlist" > "$nlist"S - fi - - if test -f "$nlist"S; then - eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"' - else - $echo '/* NONE */' >> "$output_objdir/$dlsyms" - fi - - $echo >> "$output_objdir/$dlsyms" "\ - -#undef lt_preloaded_symbols - -#if defined (__STDC__) && __STDC__ -# define lt_ptr void * -#else -# define lt_ptr char * -# define const -#endif - -/* The mapping between symbol names and symbols. */ -const struct { - const char *name; - lt_ptr address; -} -lt_preloaded_symbols[] = -{\ -" - - eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms" - - $echo >> "$output_objdir/$dlsyms" "\ - {0, (lt_ptr) 0} -}; - -/* This works around a problem in FreeBSD linker */ -#ifdef FREEBSD_WORKAROUND -static const void *lt_preloaded_setup() { - return lt_preloaded_symbols; -} -#endif - -#ifdef __cplusplus -} -#endif\ -" - fi - - pic_flag_for_symtable= - case $host in - # compiling the symbol table file with pic_flag works around - # a FreeBSD bug that causes programs to crash when -lm is - # linked before any other PIC object. But we must not use - # pic_flag when linking with -static. The problem exists in - # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";; - esac;; - *-*-hpux*) - case "$compile_command " in - *" -static "*) ;; - *) pic_flag_for_symtable=" $pic_flag";; - esac - 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 $? - - # 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}%"` - ;; - *) - $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit $EXIT_FAILURE - ;; - esac - else - # We keep going just in case the user didn't refer to - # lt_preloaded_symbols. The linker will fail if global_symbol_pipe - # really was required. - - # Nullify the symbol file. - compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"` - finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"` - fi - - if test "$need_relink" = no || test "$build_libtool_libs" != yes; then - # Replace the output file specification. - compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - link_command="$compile_command$compile_rpath" - - # We have no uninstalled library dependencies, so finalize right now. - $show "$link_command" - $run eval "$link_command" - status=$? - - # Delete the generated files. - if test -n "$dlsyms"; then - $show "$rm $output_objdir/${outputname}S.${objext}" - $run $rm "$output_objdir/${outputname}S.${objext}" - fi - - exit $status - fi - - if test -n "$shlibpath_var"; then - # We should set the shlibpath_var - rpath= - for dir in $temp_rpath; do - case $dir in - [\\/]* | [A-Za-z]:[\\/]*) - # Absolute path. - rpath="$rpath$dir:" - ;; - *) - # Relative path: add a thisdir entry. - rpath="$rpath\$thisdir/$dir:" - ;; - esac - done - temp_rpath="$rpath" - fi - - if test -n "$compile_shlibpath$finalize_shlibpath"; then - compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command" - fi - if test -n "$finalize_shlibpath"; then - finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command" - fi - - compile_var= - finalize_var= - if test -n "$runpath_var"; then - if test -n "$perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $perm_rpath; do - rpath="$rpath$dir:" - done - compile_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - if test -n "$finalize_perm_rpath"; then - # We should set the runpath_var. - rpath= - for dir in $finalize_perm_rpath; do - rpath="$rpath$dir:" - done - finalize_var="$runpath_var=\"$rpath\$$runpath_var\" " - fi - fi - - if test "$no_install" = yes; then - # We don't need to create a wrapper script. - link_command="$compile_var$compile_command$compile_rpath" - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'` - # Delete the old output file. - $run $rm $output - # Link the executable and exit - $show "$link_command" - $run eval "$link_command" || exit $? - exit $EXIT_SUCCESS - fi - - if test "$hardcode_action" = relink; then - # Fast installation is not supported - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - - $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2 - $echo "$modename: \`$output' will be relinked during installation" 1>&2 - else - if test "$fast_install" != no; then - link_command="$finalize_var$compile_command$finalize_rpath" - if test "$fast_install" = yes; then - relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'` - else - # fast_install is set to needless - relink_command= - fi - else - link_command="$compile_var$compile_command$compile_rpath" - relink_command="$finalize_var$finalize_command$finalize_rpath" - fi - fi - - # Replace the output file specification. - link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'` - - # Delete the old output files. - $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname - - $show "$link_command" - $run eval "$link_command" || exit $? - - # Now create the wrapper script. - $show "creating $output" - - # Quote the relink command for shipping. - if test -n "$relink_command"; then - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done - relink_command="(cd `pwd`; $relink_command)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` - fi - - # Quote $echo for shipping. - if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then - case $progpath in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; - *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; - esac - qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` - else - qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"` - fi - - # Only actually do things if our run command is non-null. - if test -z "$run"; then - # win32 will think the script is a binary if it has - # a .exe suffix, so we strip it off here. - case $output in - *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;; - esac - # test for cygwin because mv fails w/o .exe extensions - case $host in - *cygwin*) - exeext=.exe - outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;; - *) exeext= ;; - 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 - - cat > $cwrappersource <> $cwrappersource<<"EOF" -#include -#include -#include -#include -#include -#include - -#if defined(PATH_MAX) -# define LT_PATHMAX PATH_MAX -#elif defined(MAXPATHLEN) -# define LT_PATHMAX MAXPATHLEN -#else -# define LT_PATHMAX 1024 -#endif - -#ifndef DIR_SEPARATOR -#define DIR_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 -#endif - -#ifndef DIR_SEPARATOR_2 -# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR) -#else /* DIR_SEPARATOR_2 */ -# define IS_DIR_SEPARATOR(ch) \ - (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2)) -#endif /* DIR_SEPARATOR_2 */ - -#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type))) -#define XFREE(stale) do { \ - if (stale) { free ((void *) stale); stale = 0; } \ -} while (0) - -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); -char * strendzap(char *str, const char *pat); -void lt_fatal (const char *message, ...); - -int -main (int argc, char *argv[]) -{ - char **newargz; - int i; - - program_name = (char *) xstrdup ((char *) basename (argv[0])); - newargz = XMALLOC(char *, argc+2); -EOF - - cat >> $cwrappersource <> $cwrappersource <<"EOF" - newargz[1] = fnqualify(argv[0]); - /* 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; -EOF - - cat >> $cwrappersource <> $cwrappersource <<"EOF" -} - -void * -xmalloc (size_t num) -{ - void * p = (void *) malloc (num); - if (!p) - lt_fatal ("Memory exhausted"); - - return p; -} - -char * -xstrdup (const char *string) -{ - return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL -; -} - -char * -basename (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] == ':') - name += 2; -#endif - - for (base = name; *name; name++) - if (IS_DIR_SEPARATOR (*name)) - base = name + 1; - return (char *) base; -} - -char * -fnqualify(const char *path) -{ - size_t size; - char *p; - char tmp[LT_PATHMAX + 1]; - - assert(path != NULL); - - /* Is it qualified already? */ -#if defined (HAVE_DOS_BASED_FILE_SYSTEM) - if (isalpha (path[0]) && path[1] == ':') - return xstrdup (path); -#endif - if (IS_DIR_SEPARATOR (path[0])) - return xstrdup (path); - - /* prepend the current directory */ - /* doesn't handle '~' */ - 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; -} - -char * -strendzap(char *str, const char *pat) -{ - size_t len, patlen; - - assert(str != NULL); - assert(pat != NULL); - - len = strlen(str); - patlen = strlen(pat); - - if (patlen <= len) - { - str += len - patlen; - if (strcmp(str, pat) == 0) - *str = '\0'; - } - return str; -} - -static void -lt_error_core (int exit_status, const char * mode, - const char * message, va_list ap) -{ - fprintf (stderr, "%s: %s: ", program_name, mode); - vfprintf (stderr, message, ap); - fprintf (stderr, ".\n"); - - if (exit_status >= 0) - exit (exit_status); -} - -void -lt_fatal (const char *message, ...) -{ - va_list ap; - va_start (ap, message); - lt_error_core (EXIT_FAILURE, "FATAL", message, ap); - va_end (ap); -} -EOF - # we should really use a build-platform specific compiler - # here, but OTOH, the wrappers (shell script and this C one) - # are only useful if you want to execute the "real" binary. - # Since the "real" binary is built for $host, then this - # wrapper might as well be built for $host, too. - $run $LTCC -s -o $cwrapper $cwrappersource - ;; - esac - $rm $output - trap "$rm $output; exit $EXIT_FAILURE" 1 2 15 - - $echo > $output "\ -#! $SHELL - -# $output - temporary wrapper script for $objdir/$outputname -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# The $output program cannot be directly executed until all the libtool -# libraries that it depends on are installed. -# -# This wrapper script should never be moved out of the build directory. -# If it is, it will not operate correctly. - -# Sed substitution that helps us do robust quoting. It backslashifies -# metacharacters that are still active within double-quoted strings. -Xsed='${SED} -e 1s/^X//' -sed_quote_subst='$sed_quote_subst' - -# 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 - -relink_command=\"$relink_command\" - -# This environment variable determines our operation mode. -if test \"\$libtool_install_magic\" = \"$magic\"; then - # install mode needs the following variable: - notinst_deplibs='$notinst_deplibs' -else - # When we are sourced in execute mode, \$file and \$echo are already set. - if test \"\$libtool_execute_magic\" != \"$magic\"; then - echo=\"$qecho\" - file=\"\$0\" - # Make sure echo works. - if test \"X\$1\" = X--no-reexec; then - # Discard the --no-reexec flag, and continue. - shift - elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then - # Yippee, \$echo works! - : - else - # Restart under the correct shell, and then maybe \$echo will work. - exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"} - fi - fi\ -" - $echo >> $output "\ - - # Find the directory that this script lives in. - thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\` - test \"x\$thisdir\" = \"x\$file\" && thisdir=. - - # Follow symbolic links until we get to the real thisdir. - file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\` - while test -n \"\$file\"; do - destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\` - - # If there was a directory component, then change thisdir. - if test \"x\$destdir\" != \"x\$file\"; then - case \"\$destdir\" in - [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;; - *) thisdir=\"\$thisdir/\$destdir\" ;; - esac - fi - - file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\` - file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\` - done - - # Try to get the absolute directory name. - absdir=\`cd \"\$thisdir\" && pwd\` - test -n \"\$absdir\" && thisdir=\"\$absdir\" -" - - if test "$fast_install" = yes; then - $echo >> $output "\ - program=lt-'$outputname'$exeext - progdir=\"\$thisdir/$objdir\" - - if test ! -f \"\$progdir/\$program\" || \\ - { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\ - test \"X\$file\" != \"X\$progdir/\$program\"; }; then - - file=\"\$\$-\$program\" - - if test ! -d \"\$progdir\"; then - $mkdir \"\$progdir\" - else - $rm \"\$progdir/\$file\" - fi" - - $echo >> $output "\ - - # relink executable if necessary - if test -n \"\$relink_command\"; then - if relink_command_output=\`eval \$relink_command 2>&1\`; then : - else - $echo \"\$relink_command_output\" >&2 - $rm \"\$progdir/\$file\" - exit $EXIT_FAILURE - fi - fi - - $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null || - { $rm \"\$progdir/\$program\"; - $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; } - $rm \"\$progdir/\$file\" - fi" - else - $echo >> $output "\ - program='$outputname' - progdir=\"\$thisdir/$objdir\" -" - fi - - $echo >> $output "\ - - if test -f \"\$progdir/\$program\"; then" - - # Export our shlibpath_var if we have one. - if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then - $echo >> $output "\ - # Add our own library path to $shlibpath_var - $shlibpath_var=\"$temp_rpath\$$shlibpath_var\" - - # Some systems cannot cope with colon-terminated $shlibpath_var - # The second colon is a workaround for a bug in BeOS R4 sed - $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\` - - export $shlibpath_var -" - fi - - # fixup the dll searchpath if we need to. - if test -n "$dllsearchpath"; then - $echo >> $output "\ - # Add the dll search path components to the executable PATH - PATH=$dllsearchpath:\$PATH -" - fi - - $echo >> $output "\ - if test \"\$libtool_execute_magic\" != \"$magic\"; then - # Run the actual program with our arguments. -" - case $host in - # Backslashes separate directories on plain windows - *-*-mingw | *-*-os2*) - $echo >> $output "\ - exec \$progdir\\\\\$program \${1+\"\$@\"} -" - ;; - - *) - $echo >> $output "\ - exec \$progdir/\$program \${1+\"\$@\"} -" - ;; - esac - $echo >> $output "\ - \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" - exit $EXIT_FAILURE - fi - else - # The program doesn't exist. - \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 - \$echo \"This script is just a wrapper for \$program.\" 1>&2 - $echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit $EXIT_FAILURE - fi -fi\ -" - chmod +x $output - fi - exit $EXIT_SUCCESS - ;; - esac - - # See if we need to build an old-fashioned archive. - for oldlib in $oldlibs; do - - if test "$build_libtool_libs" = convenience; then - oldobjs="$libobjs_save" - addlibs="$convenience" - build_libtool_libs=no - else - if test "$build_libtool_libs" = module; then - oldobjs="$libobjs_save" - build_libtool_libs=no - else - oldobjs="$old_deplibs $non_pic_objects" - fi - addlibs="$old_convenience" - fi - - 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 - 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 - eval cmds=\"$old_archive_cmds\" - - if len=`expr "X$cmds" : ".*"` && - test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - cmds=$old_archive_cmds - else - # the command line is too long to link in one step, link in parts - $echo "using piecewise archive linking..." - save_RANLIB=$RANLIB - RANLIB=: - objlist= - concat_cmds= - save_oldobjs=$oldobjs - # 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 - last_oldobj=$obj - done - for obj in $save_oldobjs - do - oldobjs="$objlist $obj" - objlist="$objlist $obj" - eval test_cmds=\"$old_archive_cmds\" - if len=`expr "X$test_cmds" : ".*"` && - test "$len" -le "$max_cmd_len"; then - : - else - # the above command should be used before it gets too long - oldobjs=$objlist - if test "$obj" = "$last_oldobj" ; then - RANLIB=$save_RANLIB - fi - test -z "$concat_cmds" || concat_cmds=$concat_cmds~ - eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" - objlist= - fi - done - RANLIB=$save_RANLIB - oldobjs=$objlist - if test "X$oldobjs" = "X" ; then - eval cmds=\"\$concat_cmds\" - else - eval cmds=\"\$concat_cmds~\$old_archive_cmds\" - fi - fi - fi - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - eval cmd=\"$cmd\" - IFS="$save_ifs" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - - if test -n "$generated"; then - $show "${rm}r$generated" - $run ${rm}r$generated - fi - - # Now create the libtool archive. - case $output in - *.la) - old_library= - test "$build_old_libs" = yes && old_library="$libname.$libext" - $show "creating $output" - - # Preserve any variables that may affect compiler behavior - for var in $variables_saved_for_relink; do - if eval test -z \"\${$var+set}\"; then - relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command" - elif eval var_value=\$$var; test -z "$var_value"; then - relink_command="$var=; export $var; $relink_command" - else - var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"` - relink_command="$var=\"$var_value\"; export $var; $relink_command" - fi - done - # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" - relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` - if test "$hardcode_automatic" = yes ; then - relink_command= - fi - - - # Only create the output if not a dry run. - if test -z "$run"; then - for installed in no yes; do - if test "$installed" = yes; then - if test -z "$install_libdir"; then - break - fi - output="$output_objdir/$outputname"i - # Replace all uninstalled libtool libraries with the installed ones - newdependency_libs= - for deplib in $dependency_libs; do - case $deplib in - *.la) - name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` - if test -z "$libdir"; then - $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdependency_libs="$newdependency_libs $libdir/$name" - ;; - *) newdependency_libs="$newdependency_libs $deplib" ;; - esac - done - dependency_libs="$newdependency_libs" - newdlfiles= - for lib in $dlfiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlfiles="$newdlfiles $libdir/$name" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'` - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` - if test -z "$libdir"; then - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit $EXIT_FAILURE - fi - newdlprefiles="$newdlprefiles $libdir/$name" - done - dlprefiles="$newdlprefiles" - else - newdlfiles= - for lib in $dlfiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlfiles="$newdlfiles $abs" - done - dlfiles="$newdlfiles" - newdlprefiles= - for lib in $dlprefiles; do - case $lib in - [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; - *) abs=`pwd`"/$lib" ;; - esac - newdlprefiles="$newdlprefiles $abs" - done - dlprefiles="$newdlprefiles" - fi - $rm $output - # place dlname in correct position for cygwin - tdlname=$dlname - case $host,$output,$installed,$module,$dlname in - *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;; - esac - $echo > $output "\ -# $outputname - a libtool library file -# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='$tdlname' - -# Names of this library. -library_names='$library_names' - -# The name of the static archive. -old_library='$old_library' - -# Libraries that this one depends upon. -dependency_libs='$dependency_libs' - -# Version information for $libname. -current=$current -age=$age -revision=$revision - -# Is this an already installed library? -installed=$installed - -# Should we warn about portability when linking against -modules? -shouldnotlink=$module - -# Files to dlopen/dlpreopen -dlopen='$dlfiles' -dlpreopen='$dlprefiles' - -# Directory that this library needs to be installed in: -libdir='$install_libdir'" - if test "$installed" = no && test "$need_relink" = yes; then - $echo >> $output "\ -relink_command=\"$relink_command\"" - fi - done - fi - - # Do a symbolic link so that the libtool archive can be found in - # LD_LIBRARY_PATH before the program is installed. - $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)" - $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? - ;; - esac - exit $EXIT_SUCCESS - ;; - - # libtool install mode - install) - modename="$modename: install" - - # There may be an optional sh(1) argument at the beginning of - # install_prog (especially on Windows NT). - if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh || - # Allow the use of GNU shtool's install command. - $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then - # Aesthetically quote it. - arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$arg " - arg="$1" - shift - else - install_prog= - arg="$nonopt" - fi - - # The real first argument should be the name of the installation program. - # Aesthetically quote it. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog$arg" - - # We need to accept at least all the BSD install flags. - dest= - files= - opts= - prev= - install_type= - isdir=no - stripme= - for arg - do - if test -n "$dest"; then - files="$files $dest" - dest="$arg" - continue - fi - - case $arg in - -d) isdir=yes ;; - -f) prev="-f" ;; - -g) prev="-g" ;; - -m) prev="-m" ;; - -o) prev="-o" ;; - -s) - stripme=" -s" - continue - ;; - -*) ;; - - *) - # If the previous option needed an argument, then skip it. - if test -n "$prev"; then - prev= - else - dest="$arg" - continue - fi - ;; - esac - - # Aesthetically quote the argument. - arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"` - case $arg in - *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*) - arg="\"$arg\"" - ;; - esac - install_prog="$install_prog $arg" - done - - if test -z "$install_prog"; then - $echo "$modename: you must specify an install program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test -n "$prev"; then - $echo "$modename: the \`$prev' option requires an argument" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - if test -z "$files"; then - if test -z "$dest"; then - $echo "$modename: no file or destination specified" 1>&2 - else - $echo "$modename: you must specify a destination" 1>&2 - fi - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Strip any trailing slash from the destination. - dest=`$echo "X$dest" | $Xsed -e 's%/$%%'` - - # Check to see that the destination is a directory. - test -d "$dest" && isdir=yes - if test "$isdir" = yes; then - destdir="$dest" - destname= - else - destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'` - test "X$destdir" = "X$dest" && destdir=. - destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'` - - # Not a directory, so check to see that there is only one file specified. - set dummy $files - if test "$#" -gt 2; then - $echo "$modename: \`$dest' is not a directory" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - fi - case $destdir in - [\\/]* | [A-Za-z]:[\\/]*) ;; - *) - for file in $files; do - case $file in - *.lo) ;; - *) - $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - done - ;; - esac - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - staticlibs= - future_libdirs= - current_libdirs= - for file in $files; do - - # Do each installation. - case $file in - *.$libext) - # Do the static libraries later. - staticlibs="$staticlibs $file" - ;; - - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - library_names= - old_library= - relink_command= - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Add the libdir to current_libdirs if it is the destination. - if test "X$destdir" = "X$libdir"; then - case "$current_libdirs " in - *" $libdir "*) ;; - *) current_libdirs="$current_libdirs $libdir" ;; - esac - else - # Note the libdir as a future libdir. - case "$future_libdirs " in - *" $libdir "*) ;; - *) future_libdirs="$future_libdirs $libdir" ;; - esac - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/ - test "X$dir" = "X$file/" && dir= - dir="$dir$objdir" - - if test -n "$relink_command"; then - # Determine the prefix the user has applied to our future dir. - inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"` - - # Don't allow the user to place us outside of our expected - # location b/c this prevents finding dependent libraries that - # are installed to the same prefix. - # At present, this check doesn't affect windows .dll's that - # are installed into $libdir/../bin (currently, that works fine) - # but it's something to keep an eye on. - if test "$inst_prefix_dir" = "$destdir"; then - $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 - exit $EXIT_FAILURE - fi - - if test -n "$inst_prefix_dir"; then - # Stick the inst_prefix_dir data into the link command. - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"` - else - relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"` - fi - - $echo "$modename: warning: relinking \`$file'" 1>&2 - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - exit $EXIT_FAILURE - fi - fi - - # See the names of the shared library. - set dummy $library_names - if test -n "$2"; then - realname="$2" - shift - shift - - srcname="$realname" - test -n "$relink_command" && srcname="$realname"T - - # Install the shared library and build the symlinks. - $show "$install_prog $dir/$srcname $destdir/$realname" - $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $? - if test -n "$stripme" && test -n "$striplib"; then - $show "$striplib $destdir/$realname" - $run eval "$striplib $destdir/$realname" || exit $? - fi - - if test "$#" -gt 0; then - # Delete the old symlinks, and create new ones. - 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)" - fi - done - fi - - # Do each command in the postinstall commands. - lib="$destdir/$realname" - cmds=$postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - fi - - # Install the pseudo-library for information purposes. - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - instname="$dir/$name"i - $show "$install_prog $instname $destdir/$name" - $run eval "$install_prog $instname $destdir/$name" || exit $? - - # Maybe install the static library, too. - test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library" - ;; - - *.lo) - # Install (i.e. copy) a libtool object. - - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # Deduce the name of the destination old-style object file. - case $destfile in - *.lo) - staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"` - ;; - *.$objext) - staticdest="$destfile" - destfile= - ;; - *) - $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - # Install the libtool object if requested. - if test -n "$destfile"; then - $show "$install_prog $file $destfile" - $run eval "$install_prog $file $destfile" || exit $? - fi - - # Install the old object if enabled. - if test "$build_old_libs" = yes; then - # Deduce the name of the old-style object file. - staticobj=`$echo "X$file" | $Xsed -e "$lo2o"` - - $show "$install_prog $staticobj $staticdest" - $run eval "$install_prog \$staticobj \$staticdest" || exit $? - fi - exit $EXIT_SUCCESS - ;; - - *) - # Figure out destination file name, if it wasn't already specified. - if test -n "$destname"; then - destfile="$destdir/$destname" - else - destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - destfile="$destdir/$destfile" - fi - - # If the file is missing, and there is a .exe on the end, strip it - # because it is most likely a libtool script we actually want to - # install - stripped_ext="" - case $file in - *.exe) - if test ! -f "$file"; then - file=`$echo $file|${SED} 's,.exe$,,'` - stripped_ext=".exe" - fi - ;; - esac - - # Do a test to see if this is really a libtool program. - case $host in - *cygwin*|*mingw*) - wrapper=`$echo $file | ${SED} -e 's,.exe$,,'` - ;; - *) - wrapper=$file - ;; - esac - if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then - notinst_deplibs= - relink_command= - - # 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 - # If there is no directory component, then add one. - case $file in - */* | *\\*) . ${wrapperdot} ;; - *) . ./${wrapperdot} ;; - esac - - # Check the variables that should have been set. - if test -z "$notinst_deplibs"; then - $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 - exit $EXIT_FAILURE - fi - - finalize=yes - for lib in $notinst_deplibs; do - # Check to see that each library is installed. - libdir= - if test -f "$lib"; then - # If there is no directory component, then add one. - case $lib in - */* | *\\*) . $lib ;; - *) . ./$lib ;; - esac - fi - libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test - if test -n "$libdir" && test ! -f "$libfile"; then - $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2 - finalize=no - fi - done - - 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 - # If there is no directory component, then add one. - case $file in - */* | *\\*) . ${wrapperdot} ;; - *) . ./${wrapperdot} ;; - 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 - file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'` - outputname="$tmpdir/$file" - # Replace the output file specification. - relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'` - - $show "$relink_command" - if $run eval "$relink_command"; then : - else - $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - ${rm}r "$tmpdir" - continue - fi - file="$outputname" - else - $echo "$modename: warning: cannot relink \`$file'" 1>&2 - fi - else - # Install the binary that we compiled earlier. - file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"` - fi - fi - - # remove .exe since cygwin /usr/bin/install will append another - # one anyways - case $install_prog,$host in - */usr/bin/install*,*cygwin*) - case $file:$destfile in - *.exe:*.exe) - # this is ok - ;; - *.exe:*) - destfile=$destfile.exe - ;; - *:*.exe) - destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'` - ;; - esac - ;; - esac - $show "$install_prog$stripme $file $destfile" - $run eval "$install_prog\$stripme \$file \$destfile" || exit $? - test -n "$outputname" && ${rm}r "$tmpdir" - ;; - esac - done - - for file in $staticlibs; do - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - - # Set up the ranlib parameters. - oldlib="$destdir/$name" - - $show "$install_prog $file $oldlib" - $run eval "$install_prog \$file \$oldlib" || exit $? - - if test -n "$stripme" && test -n "$old_striplib"; then - $show "$old_striplib $oldlib" - $run eval "$old_striplib $oldlib" || exit $? - fi - - # Do each command in the postinstall commands. - cmds=$old_postinstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || exit $? - done - IFS="$save_ifs" - done - - if test -n "$future_libdirs"; then - $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2 - fi - - if test -n "$current_libdirs"; then - # Maybe just do a dry run. - test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' - else - exit $EXIT_SUCCESS - fi - ;; - - # libtool finish mode - finish) - modename="$modename: finish" - libdirs="$nonopt" - admincmds= - - if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then - for dir - do - libdirs="$libdirs $dir" - done - - for libdir in $libdirs; do - if test -n "$finish_cmds"; then - # Do each command in the finish commands. - cmds=$finish_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" || admincmds="$admincmds - $cmd" - done - IFS="$save_ifs" - fi - if test -n "$finish_eval"; then - # Do the single finish_eval. - eval cmds=\"$finish_eval\" - $run eval "$cmds" || admincmds="$admincmds - $cmds" - fi - done - fi - - # Exit here if they wanted silent mode. - test "$show" = : && exit $EXIT_SUCCESS - - $echo "----------------------------------------------------------------------" - $echo "Libraries have been installed in:" - for libdir in $libdirs; do - $echo " $libdir" - done - $echo - $echo "If you ever happen to want to link against installed libraries" - $echo "in a given directory, LIBDIR, you must either use libtool, and" - $echo "specify the full pathname of the library, or use the \`-LLIBDIR'" - $echo "flag during linking and do at least one of the following:" - if test -n "$shlibpath_var"; then - $echo " - add LIBDIR to the \`$shlibpath_var' environment variable" - $echo " during execution" - fi - if test -n "$runpath_var"; then - $echo " - add LIBDIR to the \`$runpath_var' environment variable" - $echo " during linking" - fi - if test -n "$hardcode_libdir_flag_spec"; then - libdir=LIBDIR - eval flag=\"$hardcode_libdir_flag_spec\" - - $echo " - use the \`$flag' linker flag" - fi - if test -n "$admincmds"; then - $echo " - have your system administrator run these commands:$admincmds" - fi - if test -f /etc/ld.so.conf; then - $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'" - fi - $echo - $echo "See any operating system documentation about shared libraries for" - $echo "more information, such as the ld(1) and ld.so(8) manual pages." - $echo "----------------------------------------------------------------------" - exit $EXIT_SUCCESS - ;; - - # libtool execute mode - execute) - modename="$modename: execute" - - # The first argument is the command name. - cmd="$nonopt" - if test -z "$cmd"; then - $echo "$modename: you must specify a COMMAND" 1>&2 - $echo "$help" - exit $EXIT_FAILURE - fi - - # Handle -dlopen flags immediately. - for file in $execute_dlfiles; do - if test ! -f "$file"; then - $echo "$modename: \`$file' is not a file" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - dir= - case $file in - *.la) - # Check to see that this really is a libtool archive. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : - else - $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - # Read the libtool library. - dlname= - library_names= - - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Skip this library if it cannot be dlopened. - if test -z "$dlname"; then - # Warn if it was a shared library. - test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'" - continue - fi - - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - - if test -f "$dir/$objdir/$dlname"; then - dir="$dir/$objdir" - else - $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit $EXIT_FAILURE - fi - ;; - - *.lo) - # Just add the directory containing the .lo file. - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - test "X$dir" = "X$file" && dir=. - ;; - - *) - $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2 - continue - ;; - esac - - # Get the absolute pathname. - absdir=`cd "$dir" && pwd` - test -n "$absdir" && dir="$absdir" - - # Now add the directory to shlibpath_var. - if eval "test -z \"\$$shlibpath_var\""; then - eval "$shlibpath_var=\"\$dir\"" - else - eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\"" - fi - done - - # This variable tells wrapper scripts just to set shlibpath_var - # rather than running their programs. - libtool_execute_magic="$magic" - - # Check if any of the arguments is a wrapper script. - args= - for file - do - case $file in - -*) ;; - *) - # Do a test to see if this is really a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - # If there is no directory component, then add one. - case $file in - */* | *\\*) . $file ;; - *) . ./$file ;; - esac - - # Transform arg to wrapped name. - file="$progdir/$program" - fi - ;; - esac - # Quote arguments (to preserve shell metacharacters). - file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"` - args="$args \"$file\"" - done - - if test -z "$run"; then - if test -n "$shlibpath_var"; then - # Export the shlibpath_var. - eval "export $shlibpath_var" - fi - - # Restore saved environment variables - if test "${save_LC_ALL+set}" = set; then - LC_ALL="$save_LC_ALL"; export LC_ALL - fi - if test "${save_LANG+set}" = set; then - LANG="$save_LANG"; export LANG - fi - - # Now prepare to actually exec the command. - exec_cmd="\$cmd$args" - else - # Display what would be done. - if test -n "$shlibpath_var"; then - eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\"" - $echo "export $shlibpath_var" - fi - $echo "$cmd$args" - exit $EXIT_SUCCESS - fi - ;; - - # libtool clean and uninstall mode - clean | uninstall) - modename="$modename: $mode" - rm="$nonopt" - files= - rmforce= - exit_status=0 - - # This variable tells wrapper scripts just to set variables rather - # than running their programs. - libtool_install_magic="$magic" - - for arg - do - case $arg in - -f) rm="$rm $arg"; rmforce=yes ;; - -*) rm="$rm $arg" ;; - *) files="$files $arg" ;; - esac - done - - if test -z "$rm"; then - $echo "$modename: you must specify an RM program" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - fi - - rmdirs= - - origobjdir="$objdir" - for file in $files; do - dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'` - if test "X$dir" = "X$file"; then - dir=. - objdir="$origobjdir" - else - objdir="$dir/$origobjdir" - fi - name=`$echo "X$file" | $Xsed -e 's%^.*/%%'` - test "$mode" = uninstall && objdir="$dir" - - # Remember objdir for removal later, being careful to avoid duplicates - if test "$mode" = clean; then - case " $rmdirs " in - *" $objdir "*) ;; - *) rmdirs="$rmdirs $objdir" ;; - esac - fi - - # Don't error if the file doesn't exist and rm -f was used. - if (test -L "$file") >/dev/null 2>&1 \ - || (test -h "$file") >/dev/null 2>&1 \ - || test -f "$file"; then - : - elif test -d "$file"; then - exit_status=1 - continue - elif test "$rmforce" = yes; then - continue - fi - - rmfiles="$file" - - case $name in - *.la) - # Possibly a libtool archive, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - . $dir/$name - - # Delete the libtool libraries and symlinks. - for n in $library_names; do - 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 - if test -n "$library_names"; then - # Do each command in the postuninstall commands. - cmds=$postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" - fi - - if test -n "$old_library"; then - # Do each command in the old_postuninstall commands. - cmds=$old_postuninstall_cmds - save_ifs="$IFS"; IFS='~' - for cmd in $cmds; do - IFS="$save_ifs" - eval cmd=\"$cmd\" - $show "$cmd" - $run eval "$cmd" - if test "$?" -ne 0 && test "$rmforce" != yes; then - exit_status=1 - fi - done - IFS="$save_ifs" - fi - # FIXME: should reinstall the best remaining shared library. - fi - fi - ;; - - *.lo) - # Possibly a libtool object, so verify it. - if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - - # Read the .lo file - . $dir/$name - - # Add PIC object to the list of files to remove. - if test -n "$pic_object" \ - && test "$pic_object" != none; then - rmfiles="$rmfiles $dir/$pic_object" - fi - - # Add non-PIC object to the list of files to remove. - if test -n "$non_pic_object" \ - && test "$non_pic_object" != none; then - rmfiles="$rmfiles $dir/$non_pic_object" - fi - fi - ;; - - *) - if test "$mode" = clean ; then - noexename=$name - case $file in - *.exe) - file=`$echo $file|${SED} 's,.exe$,,'` - noexename=`$echo $name|${SED} 's,.exe$,,'` - # $file with .exe has already been added to rmfiles, - # add $file without .exe - rmfiles="$rmfiles $file" - ;; - esac - # Do a test to see if this is a libtool program. - if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then - relink_command= - . $dir/$noexename - - # note $name still contains .exe if it was in $file originally - # as does the version of $file that was added into $rmfiles - rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}" - if test "$fast_install" = yes && test -n "$relink_command"; then - rmfiles="$rmfiles $objdir/lt-$name" - fi - if test "X$noexename" != "X$name" ; then - rmfiles="$rmfiles $objdir/lt-${noexename}.c" - fi - fi - fi - ;; - esac - $show "$rm $rmfiles" - $run $rm $rmfiles || exit_status=1 - done - objdir="$origobjdir" - - # Try to remove the ${objdir}s in the directories where we deleted files - for dir in $rmdirs; do - if test -d "$dir"; then - $show "rmdir $dir" - $run rmdir $dir >/dev/null 2>&1 - fi - done - - exit $exit_status - ;; - - "") - $echo "$modename: you must specify a MODE" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - ;; - esac - - if test -z "$exec_cmd"; then - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$generic_help" 1>&2 - exit $EXIT_FAILURE - fi -fi # test -z "$show_help" - -if test -n "$exec_cmd"; then - eval exec $exec_cmd - exit $EXIT_FAILURE -fi - -# We need to display help for each of the modes. -case $mode in -"") $echo \ -"Usage: $modename [OPTION]... [MODE-ARG]... - -Provide generalized library-building support services. - - --config show all configuration variables - --debug enable verbose shell tracing --n, --dry-run display commands without modifying any files - --features display basic configuration information and exit - --finish same as \`--mode=finish' - --help display this help message and exit - --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS] - --quiet same as \`--silent' - --silent don't print informational messages - --tag=TAG use configuration variables from tag TAG - --version print version information - -MODE must be one of the following: - - clean remove files from the build directory - compile compile a source file into a libtool object - execute automatically set library path, then run a program - finish complete the installation of libtool libraries - install install libraries or executables - link create a library or an executable - uninstall remove libraries from an installed directory - -MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for -a more detailed description of MODE. - -Report bugs to ." - exit $EXIT_SUCCESS - ;; - -clean) - $echo \ -"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE... - -Remove files from the build directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, object or program, all the files associated -with it are deleted. Otherwise, only FILE itself is deleted using RM." - ;; - -compile) - $echo \ -"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE - -Compile a source file into a libtool library object. - -This mode accepts the following additional options: - - -o OUTPUT-FILE set the output file name to OUTPUT-FILE - -prefer-pic try to building PIC objects only - -prefer-non-pic try to building non-PIC objects only - -static always build a \`.o' file suitable for static linking - -COMPILE-COMMAND is a command to be used in creating a \`standard' object file -from the given SOURCEFILE. - -The output file name is determined by removing the directory component from -SOURCEFILE, then substituting the C source code suffix \`.c' with the -library object suffix, \`.lo'." - ;; - -execute) - $echo \ -"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]... - -Automatically set library path, then run a program. - -This mode accepts the following additional options: - - -dlopen FILE add the directory containing FILE to the library path - -This mode sets the library path environment variable according to \`-dlopen' -flags. - -If any of the ARGS are libtool executable wrappers, then they are translated -into their corresponding uninstalled binary, and any of their required library -directories are added to the library path. - -Then, COMMAND is executed, with ARGS as arguments." - ;; - -finish) - $echo \ -"Usage: $modename [OPTION]... --mode=finish [LIBDIR]... - -Complete the installation of libtool libraries. - -Each LIBDIR is a directory that contains libtool libraries. - -The commands that this mode executes may require superuser privileges. Use -the \`--dry-run' option if you just want to see what would be executed." - ;; - -install) - $echo \ -"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND... - -Install executables or libraries. - -INSTALL-COMMAND is the installation command. The first component should be -either the \`install' or \`cp' program. - -The rest of the components are interpreted as arguments to that command (only -BSD-compatible install options are recognized)." - ;; - -link) - $echo \ -"Usage: $modename [OPTION]... --mode=link LINK-COMMAND... - -Link object files or libraries together to form another library, or to -create an executable program. - -LINK-COMMAND is a command using the C compiler that you would use to create -a program from several object files. - -The following components of LINK-COMMAND are treated specially: - - -all-static do not do any dynamic linking at all - -avoid-version do not add a version suffix if possible - -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime - -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols - -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3) - -export-symbols SYMFILE - try to export only the symbols listed in SYMFILE - -export-symbols-regex REGEX - try to export only the symbols matching REGEX - -LLIBDIR search LIBDIR for required installed libraries - -lNAME OUTPUT-FILE requires the installed library libNAME - -module build a library that can dlopened - -no-fast-install disable the fast-install mode - -no-install link a not-installable executable - -no-undefined declare that a library does not refer to external symbols - -o OUTPUT-FILE create OUTPUT-FILE from the specified objects - -objectlist FILE Use a list of object files found in FILE to specify objects - -precious-files-regex REGEX - don't remove output files matching REGEX - -release RELEASE specify package release information - -rpath LIBDIR the created library will eventually be installed in LIBDIR - -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries - -static do not do any dynamic linking of libtool libraries - -version-info CURRENT[:REVISION[:AGE]] - specify library version info [each variable defaults to 0] - -All other options (arguments beginning with \`-') are ignored. - -Every other argument is treated as a filename. Files ending in \`.la' are -treated as uninstalled libtool libraries, other files are standard or library -object files. - -If the OUTPUT-FILE ends in \`.la', then a libtool library is created, -only library objects (\`.lo' files) may be specified, and \`-rpath' is -required, except when creating a convenience library. - -If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created -using \`ar' and \`ranlib', or on Windows using \`lib'. - -If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file -is created, otherwise an executable program is created." - ;; - -uninstall) - $echo \ -"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE... - -Remove libraries from an installation directory. - -RM is the name of the program to use to delete files associated with each FILE -(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed -to RM. - -If FILE is a libtool library, all the files associated with it are deleted. -Otherwise, only FILE itself is deleted using RM." - ;; - -*) - $echo "$modename: invalid operation mode \`$mode'" 1>&2 - $echo "$help" 1>&2 - exit $EXIT_FAILURE - ;; -esac - -$echo -$echo "Try \`$modename --help' for more information about other modes." - -exit $EXIT_SUCCESS - -# The TAGs below are defined such that we never get into a situation -# in which we disable both kinds of libraries. Given conflicting -# choices, we go for a static library, that is the most portable, -# since we can't tell whether shared libraries were disabled because -# the user asked for that or because the platform doesn't support -# them. This is particularly important on AIX, because we don't -# support having both static and shared libraries enabled at the same -# time on that platform, so we default to a shared-only configuration. -# If a disable-shared tag is given, we'll fallback to a static-only -# 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 -# ### 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` -# ### END LIBTOOL TAG CONFIG: disable-static - -# Local Variables: -# mode:shell-script -# sh-indentation:2 -# End: diff -Naur WindowMaker-0.91.0/Makefile.in wm/Makefile.in --- WindowMaker-0.91.0/Makefile.in 2004-10-26 08:10:45 +0400 +++ wm/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,371 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = . - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -SUBDIRS = wrlib WINGs src util po WindowMaker wmlib test WPrefs.app doc contrib - - -EXTRA_DIST = TODO BUGS BUGFORM FAQ FAQ.I18N FAQ.I18N.cs FAQ.I18N.sk INSTALL.cs INSTALL.fr INSTALL.es INSTALL.pt INSTALL.sk README.definable-cursor README.pt MIRRORS COPYING.WTFPL mkpatch - -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ./src/config.h -CONFIG_CLEAN_FILES = -DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -Makefile.in NEWS TODO acinclude.m4 aclocal.m4 config.guess config.sub \ -configure configure.ac install-sh ltmain.sh missing mkinstalldirs - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status - -$(ACLOCAL_M4): configure.ac acinclude.m4 - cd $(srcdir) && $(ACLOCAL) - -config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - $(SHELL) ./config.status --recheck -$(srcdir)/configure: $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES) - cd $(srcdir) && $(AUTOCONF) - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(PACKAGE)-$(VERSION) -top_distdir = $(distdir) - -# This target untars the dist file and tries a VPATH configuration. Then -# it guarantees that the distribution is self-contained by making another -# tarfile. -distcheck: dist - -rm -rf $(distdir) - GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz - mkdir $(distdir)/=build - mkdir $(distdir)/=inst - dc_install_base=`cd $(distdir)/=inst && pwd`; \ - cd $(distdir)/=build \ - && ../configure --srcdir=.. --prefix=$$dc_install_base \ - && $(MAKE) $(AM_MAKEFLAGS) \ - && $(MAKE) $(AM_MAKEFLAGS) dvi \ - && $(MAKE) $(AM_MAKEFLAGS) check \ - && $(MAKE) $(AM_MAKEFLAGS) install \ - && $(MAKE) $(AM_MAKEFLAGS) installcheck \ - && $(MAKE) $(AM_MAKEFLAGS) dist - -rm -rf $(distdir) - @banner="$(distdir).tar.gz is ready for distribution"; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes" -dist: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -dist-all: distdir - -chmod -R a+r $(distdir) - GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir) - -rm -rf $(distdir) -distdir: $(DISTFILES) - -rm -rf $(distdir) - mkdir $(distdir) - -chmod 777 $(distdir) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive -check-am: all-am -check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -install-exec-am: -install-exec: install-exec-recursive - -install-data-am: -install-data: install-data-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: -uninstall: uninstall-recursive -all-am: Makefile -all-redirect: all-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-recursive - -clean-am: clean-tags clean-generic mostlyclean-am - -clean: clean-recursive - -distclean-am: distclean-tags distclean-generic clean-am - -rm -f libtool - -distclean: distclean-recursive - -rm -f config.status - -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-recursive - -rm -f config.status - -.PHONY: install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - -# libwmfun-0.0.3.tar.gz - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/NEWS wm/NEWS --- WindowMaker-0.91.0/NEWS 2004-10-26 08:09:57 +0400 +++ wm/NEWS 2005-03-12 02:05:43 +0300 @@ -2,6 +2,37 @@ NEWS for veteran Window Maker users ----------------------------------- +--- 0.92.0 + +GNUstep Installation Directory +------------------------------ + +WPrefs is now installed in /usr/local/bin and /usr/local/share by default. +If you use GNUstep and want it to install in /usr/GNUstep/Applications, +you may specify --with-gnustepdir=/usr/GNUstep +If the GNUSTEP_LOCAL_ROOT environment variable is defined when configure is +executed, it will be used (and you don't need to use --with-gnustepdir) + +Cached Pixmaps Directory +------------------------ + +The directory where Window Maker stores the cached application pixmaps for +its later use has changed from ~/GNUstep/.AppInfo/WindowMaker to +~/GNUstep/Library/WindowMaker/CachedPixmaps for better compatibility with +the GNUstep path structure. +Also WPrefs now stores internal data in ~/GNUstep/Library/WindowMaker/WPrefs +(it was ~/GNUstep/.AppInfo/WPrefs before) + + +--- 0.91.1 + +To disable the panel shown during Alt-tabbing, you may put the following in +~/GNUstep/Defaults/WindowMaker + +SwitchPanelImages= None; + + + --- 0.91.0 Alt-Tab Window Switching @@ -311,9 +342,10 @@ Client supplied icons --------------------- -Window Maker saves the client supplied icons in ~/GNUstep/.AppInfo/WindowMaker -in XPM format for later use when the app is no longer running (to have the -image to display for docked icons for example). +Window Maker saves the client supplied icons in +~/GNUstep/Library/WindowMaker/CachedPixmaps in XPM format for later use +when the app is no longer running (to have the image to display for docked +icons for example). Until recently the XPM images saved by Window Maker were incorrect, but a recent fix in the code to save XPM's fixed them. But with this fix, all @@ -321,12 +353,12 @@ wrong images on screen or fail to load). To avoid the need for the user to fix this by hand editing WMWindowAttributes -and removing all references to icons in ~/GNUstep/.AppInfo/WindowMaker which -can be annoying, new code was added to Window Maker to permit the regeneration -of images in ~/GNUstep/.AppInfo/WindowMaker if they are missing. +and removing all references to icons in ~/GNUstep/Library/WindowMaker/CachedPixmaps +which can be annoying, new code was added to Window Maker to permit the +regeneration of images in ~/GNUstep/Library/WindowMaker/CachedPixmaps if they are missing. With this addition, all you need to do to fix your old broken images, is to -delete all *.xpm files from ~/GNUstep/.AppInfo/WindowMaker. Next time the +delete all *.xpm files from ~/GNUstep/Library/WindowMaker/CachedPixmaps. Next time the application that is supplying an icon image will start the icon will be recreated if missing, but this time it will be saved with the new XPM save code which produces good XPM images. @@ -1192,7 +1224,7 @@ Application supplied icons are now stored, so that the dock will keep showing them after the app is exited. The icons are stored at -~/GNUstep/.AppInfo/WindowMaker/ +~/GNUstep/Library/WindowMaker/CachedPixmaps Sound support diff -Naur WindowMaker-0.91.0/plugins/CVS/Entries wm/plugins/CVS/Entries --- WindowMaker-0.91.0/plugins/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/plugins/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1,2 @@ +/.cvsignore/1.3/Wed Apr 2 11:37:10 2003// +D diff -Naur WindowMaker-0.91.0/plugins/CVS/Entries.Log wm/plugins/CVS/Entries.Log --- WindowMaker-0.91.0/plugins/CVS/Entries.Log 1970-01-01 03:00:00 +0300 +++ wm/plugins/CVS/Entries.Log 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +A D/libwmfun//// diff -Naur WindowMaker-0.91.0/plugins/CVS/Repository wm/plugins/CVS/Repository --- WindowMaker-0.91.0/plugins/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/plugins/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/plugins diff -Naur WindowMaker-0.91.0/plugins/CVS/Root wm/plugins/CVS/Root --- WindowMaker-0.91.0/plugins/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/plugins/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/plugins/.cvsignore wm/plugins/.cvsignore --- WindowMaker-0.91.0/plugins/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/plugins/.cvsignore 2003-04-02 15:37:10 +0400 @@ -0,0 +1,2 @@ +.psrc .inslog2 tca.map tca.log pchdir *.rpt +libwmfun*.tar.gz diff -Naur WindowMaker-0.91.0/plugins/libwmfun/bilinear.c wm/plugins/libwmfun/bilinear.c --- WindowMaker-0.91.0/plugins/libwmfun/bilinear.c 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/bilinear.c 2000-12-03 21:58:41 +0300 @@ -0,0 +1,85 @@ +/* + * libwmfun - WindowMaker texture function library + * Copyright (C) 1999 Tobias Gloth + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +/* + * $Id: bilinear.c,v 1.1 2000/12/03 18:58:41 id Exp $ + * + * $Log: bilinear.c,v $ + * Revision 1.1 2000/12/03 18:58:41 id + * initiate plugins branch + * + * Revision 1.1.1.1 1999/02/21 17:16:47 gloth + * initial revision + * + */ + +#include "generic.h" + +RImage *bilinear (int argc, char **argv, int width, int height, + int relief) { + + int color[4][3]; + RImage *image; + unsigned char *cptr; + int i, j, k; + + argc--; argv++; + + if (!start_image ("bilinear", argc, 4, 5, width, height, &image)) { + return (RImage *)0; + } + + for (i=0; i<4; i++) { + if (!parse_color (argv[i], color[i])) { + error ("can't parse color: \"%s\"\n", argv[i]); + return 0; + } + } + + cptr = image->data; + for (i=0; i> 8; + f[1] = (r*t) >> 8; + f[2] = (l*b) >> 8; + f[3] = (r*b) >> 8; + + for (k=0; k<3; k++) { + *cptr++ = + ( f[0] * color[0][k] + + f[1] * color[1][k] + + f[2] * color[2][k] + + f[3] * color[3][k] ) >> 8; + } + + if (RRGBAFormat==image->format) + cptr++; + } + } + return image; +} + diff -Naur WindowMaker-0.91.0/plugins/libwmfun/CVS/Entries wm/plugins/libwmfun/CVS/Entries --- WindowMaker-0.91.0/plugins/libwmfun/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1,11 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:10 2003// +/Makefile/1.2/Thu Jul 26 20:15:10 2001// +/bilinear.c/1.1/Sun Dec 3 18:58:41 2000// +/fade.c/1.3/Sun Apr 22 02:15:23 2001// +/generic.c/1.1/Sun Dec 3 18:58:41 2000// +/generic.h/1.4/Sun Jan 7 02:59:11 2001// +/getopt.c/1.2/Sun Jan 7 02:59:11 2001// +/getopt.h/1.1/Sun Dec 3 18:58:41 2000// +/getopt1.c/1.2/Sun Jan 7 02:59:11 2001// +/wave.c/1.1/Sun Dec 3 18:58:41 2000// +D diff -Naur WindowMaker-0.91.0/plugins/libwmfun/CVS/Repository wm/plugins/libwmfun/CVS/Repository --- WindowMaker-0.91.0/plugins/libwmfun/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/plugins/libwmfun diff -Naur WindowMaker-0.91.0/plugins/libwmfun/CVS/Root wm/plugins/libwmfun/CVS/Root --- WindowMaker-0.91.0/plugins/libwmfun/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/plugins/libwmfun/.cvsignore wm/plugins/libwmfun/.cvsignore --- WindowMaker-0.91.0/plugins/libwmfun/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/.cvsignore 2003-04-02 15:37:10 +0400 @@ -0,0 +1,5 @@ +Makefile Makefile.in +*.lo *.la +stamp-h stamp-h.in config.h config.h.in +.libs +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/plugins/libwmfun/fade.c wm/plugins/libwmfun/fade.c --- WindowMaker-0.91.0/plugins/libwmfun/fade.c 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/fade.c 2001-04-22 06:15:23 +0400 @@ -0,0 +1,128 @@ +/* + * libwmfun - WindowMaker texture function library + * Copyright (C) 1999 Tobias Gloth + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +#include "getopt.h" +#include +#include +#include + +#include "generic.h" + +RImage *fade (int argc, char **argv, int width, int height, int relief) { + + int from[3] = { 0x00, 0x00, 0x00 }; + int to[3] = { 0xff, 0xff, 0xff }; + int *this, *last; + RImage *image; + unsigned char *cptr; + int i, j; + double factor, delta; + + int c, done, option_index = 0; + + optind = 1; + for (done=0; !done; ) { + static struct option long_options[] = { + {"from", 1, 0, 'f'}, + {"to", 1, 0, 't'}, + {0, 0, 0, 0} + }; + + c = getopt_long (argc, argv, "f:t:", + long_options, &option_index); + if (c == -1) { + break; + } + + switch (c) { + case 'f': + if (!parse_color (optarg, from)) { + error ("invalid color: %s\n", optarg); + return 0; + } + break; + case 't': + if (!parse_color (optarg, to)) { + error ("invalid color: %s\n", optarg); + return 0; + } + break; + default: + done = 1; + break; + } + } + + argc -= optind; + argv += optind; + + if (!start_image ("fade", argc, 0, 1, width, height, &image)) { + return (RImage *)0; + } + + this = (int *) malloc (width * sizeof (int)); + last = (int *) malloc (width * sizeof (int)); + if (!this || !last) { + RReleaseImage (image); + free (this); + free (last); + return (RImage *)0; + } + + for (i=0; idata; + for (j=0; j= width) { + k = width - 1; + } + + this[i] = (int) (f * last[k]); + interpolate_color (output, from, to, this[i]); + *cptr++ = output[0]; + *cptr++ = output[1]; + *cptr++ = output[2]; + if (RRGBAFormat==image->format) + cptr++; + } + } + + free (this); + free (last); + + return image; +} + diff -Naur WindowMaker-0.91.0/plugins/libwmfun/generic.c wm/plugins/libwmfun/generic.c --- WindowMaker-0.91.0/plugins/libwmfun/generic.c 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/generic.c 2000-12-03 21:58:41 +0300 @@ -0,0 +1,116 @@ +/* + * libwmfun - WindowMaker texture function library + * Copyright (C) 1999 Tobias Gloth + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +/* + * $Id: generic.c,v 1.1 2000/12/03 18:58:41 id Exp $ + * + * $Log: generic.c,v $ + * Revision 1.1 2000/12/03 18:58:41 id + * initiate plugins branch + * + * Revision 1.1.1.1 1999/02/21 17:16:47 gloth + * initial revision + * + */ + +#include +#include +#include + +#include "generic.h" + +static Display *dpy = 0; +static Colormap cmap; + +void initWindowMaker (Display *d, Colormap c) { + if (!d) { + return; + } + dpy = d; + cmap = c; +} + +void error (const char *format, ...) { + va_list args; + va_start (args, format); + vfprintf (stderr, format, args); + va_end (args); +} + +int parse_color (const char *string, int *result) { + XColor color; + + if (!XParseColor (dpy, cmap, string, &color)) { + return 0; + } + result[0] = color.red >> 8; + result[1] = color.green >> 8; + result[2] = color.blue >> 8; + + return 1; +} + +int parse_xcolor (const char *string, XColor *xcolor) { + if (!XParseColor (dpy, cmap, string, xcolor)) { + return 0; + } + if (!XAllocColor (dpy, cmap, xcolor)) { + return 0; + } + + return 1; +} + +void interpolate_color (int *t, const int *s0, const int *s1, int mix) { + t[0] = (mix * s0[0] + (255 - mix) * s1[0]) >> 8; + t[1] = (mix * s0[1] + (255 - mix) * s1[1]) >> 8; + t[2] = (mix * s0[2] + (255 - mix) * s1[2]) >> 8; +} + +int random_int (int range) { + return rand() / (RAND_MAX / range + 1); +} + +double random_double (double range) { + return ((double)rand()) / (((double)RAND_MAX) / range); +} + +int start_image (const char *name, + int argc, int argc_min, int argc_max, + int width, int height, RImage **image) { + + if (!dpy) { + error ("%s: library not initialized\n", name); + return 0; + } + + if ((argc < argc_min) || (argc >= argc_max)) { + error ("%s: invalid number of parameters: \n", name, argc); + return 0; + } + + *image = RCreateImage (width, height, 0); + if (!*image) { + error ("%s: can't create image\n", name); + return 0; + } + return 1; +} + diff -Naur WindowMaker-0.91.0/plugins/libwmfun/generic.h wm/plugins/libwmfun/generic.h --- WindowMaker-0.91.0/plugins/libwmfun/generic.h 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/generic.h 2001-01-07 05:59:11 +0300 @@ -0,0 +1,66 @@ +/* + * libwmfun - WindowMaker texture function library + * Copyright (C) 1999 Tobias Gloth + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +/* + * $Id: generic.h,v 1.4 2001/01/07 02:59:11 id Exp $ + * + * $Log: generic.h,v $ + * Revision 1.4 2001/01/07 02:59:11 id + * remove stuffs + * + * Revision 1.3 2000/12/11 03:10:26 id + * changes related to plugin system & drawstring + * + * Revision 1.2 2000/12/03 22:18:20 id + * initiate + * + * Revision 1.1 2000/12/03 18:58:41 id + * initiate plugins branch + * + * Revision 1.1.1.1 1999/02/21 17:16:47 gloth + * initial revision + * + */ + +#ifndef _GENERIC_H +#define _GENERIC_H + +#include + +#include + +typedef struct _WPluginData { + int size; + void **array; +} WPluginData; + +extern void initWindowMaker (Display *d, Colormap c); +extern int start_image (const char *name, int argc, int argc_min, int argc_max, + int width, int height, RImage **image); +extern void error (const char *format, ...); + +extern int parse_color (const char *string, int *result); +extern void interpolate_color (int *t, const int *s0, const int *s1, int mix); + +extern int random_int (int range); +extern double random_double (double range); + + +#endif diff -Naur WindowMaker-0.91.0/plugins/libwmfun/getopt1.c wm/plugins/libwmfun/getopt1.c --- WindowMaker-0.91.0/plugins/libwmfun/getopt1.c 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/getopt1.c 2001-01-07 05:59:11 +0300 @@ -0,0 +1,173 @@ +/* getopt_long and getopt_long_only entry points for GNU getopt. + Copyright (C) 1987, 88, 89, 90, 91, 92, 1993 + Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. */ + + +#include "getopt.h" + +#ifndef __STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +#ifndef const +#define const +#endif +#endif + +#include + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#if defined (_LIBC) || !defined (__GNU_LIBRARY__) + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +#include +#else +char *getenv (); +#endif + +#ifndef NULL +#define NULL 0 +#endif + +int +getopt_long (argc, argv, options, long_options, opt_index) + int argc; + char *const *argv; + const char *options; + const struct option *long_options; + int *opt_index; +{ + return _getopt_internal (argc, argv, options, long_options, opt_index, 0); +} + +/* Like getopt_long, but '-' as well as '--' can indicate a long option. + If an option that starts with '-' (not '--') doesn't match a long option, + but does match a short option, it is parsed as a short option + instead. */ + +int +getopt_long_only (argc, argv, options, long_options, opt_index) + int argc; + char *const *argv; + const char *options; + const struct option *long_options; + int *opt_index; +{ + return _getopt_internal (argc, argv, options, long_options, opt_index, 1); +} + + +#endif /* _LIBC or not __GNU_LIBRARY__. */ + +#ifdef TEST + +#include + +int +main (argc, argv) + int argc; + char **argv; +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + int option_index = 0; + static struct option long_options[] = + { + {"add", 1, 0, 0}, + {"append", 0, 0, 0}, + {"delete", 1, 0, 0}, + {"verbose", 0, 0, 0}, + {"create", 0, 0, 0}, + {"file", 1, 0, 0}, + {0, 0, 0, 0} + }; + + c = getopt_long (argc, argv, "abc:d:0123456789", + long_options, &option_index); + if (c == EOF) + break; + + switch (c) + { + case 0: + printf ("option %s", long_options[option_index].name); + if (optarg) + printf (" with arg %s", optarg); + printf ("\n"); + break; + + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value `%s'\n", optarg); + break; + + case 'd': + printf ("option d with value `%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } + } + + if (optind < argc) + { + printf ("non-option ARGV-elements: "); + while (optind < argc) + printf ("%s ", argv[optind++]); + printf ("\n"); + } + + exit (0); +} + +#endif /* TEST */ diff -Naur WindowMaker-0.91.0/plugins/libwmfun/getopt.c wm/plugins/libwmfun/getopt.c --- WindowMaker-0.91.0/plugins/libwmfun/getopt.c 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/getopt.c 2001-01-07 05:59:11 +0300 @@ -0,0 +1,744 @@ +/* Getopt for GNU. + NOTE: getopt is now part of the C library, so if you don't know what + "Keep this file name-space clean" means, talk to roland@gnu.ai.mit.edu + before changing it! + + Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94 + Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. */ + +/* This tells Alpha OSF/1 not to define a getopt prototype in . + Ditto for AIX 3.2 and . */ +#ifndef _NO_PROTO +#define _NO_PROTO +#endif + +#ifndef __STDC__ +/* This is a separate conditional since some stdc systems + reject `defined (const)'. */ +#ifndef const +#define const +#endif +#endif + +#include + +#ifdef HAVE_STRING_H +#include +#endif + +/* Comment out all this code if we are using the GNU C Library, and are not + actually compiling the library itself. This code is part of the GNU C + Library, but also included in many other GNU distributions. Compiling + and linking in this code is a waste when using the GNU C library + (especially if it is a shared library). Rather than having every GNU + program understand `configure --with-gnu-libc' and omit the object files, + it is simpler to just do this in the source for each such file. */ + +#if defined (_LIBC) || !defined (__GNU_LIBRARY__) + + +/* This needs to come after some library #include + to get __GNU_LIBRARY__ defined. */ +#ifdef __GNU_LIBRARY__ +/* Don't include stdlib.h for non-GNU C libraries because some of them + contain conflicting prototypes for getopt. */ +#include +#endif /* GNU C library. */ + +/* This version of `getopt' appears to the caller like standard Unix `getopt' + but it behaves differently for the user, since it allows the user + to intersperse the options with the other arguments. + + As `getopt' works, it permutes the elements of ARGV so that, + when it is done, all the options precede everything else. Thus + all application programs are extended to handle flexible argument order. + + Setting the environment variable POSIXLY_CORRECT disables permutation. + Then the behavior is completely standard. + + GNU application programs can use a third alternative mode in which + they can distinguish the relative order of options and other arguments. */ + +#include "getopt.h" + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +char *optarg = NULL; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns EOF, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +/* XXX 1003.2 says this must be 1 before any call. */ +int optind = 0; + +/* The next char to be scanned in the option-element + in which the last option character we returned was found. + This allows us to pick up the scan where we left off. + + If this is zero, or a null string, it means resume the scan + by advancing to the next ARGV-element. */ + +static char *nextchar; + +/* Callers store zero here to inhibit the error message + for unrecognized options. */ + +int opterr = 1; + +/* Set to an option character which was unrecognized. + This must be initialized on some systems to avoid linking in the + system's own getopt implementation. */ + +int optopt = '?'; + +/* Describe how to deal with options that follow non-option ARGV-elements. + + If the caller did not specify anything, + the default is REQUIRE_ORDER if the environment variable + POSIXLY_CORRECT is defined, PERMUTE otherwise. + + REQUIRE_ORDER means don't recognize them as options; + stop option processing when the first non-option is seen. + This is what Unix does. + This mode of operation is selected by either setting the environment + variable POSIXLY_CORRECT, or using `+' as the first character + of the list of option characters. + + PERMUTE is the default. We permute the contents of ARGV as we scan, + so that eventually all the non-options are at the end. This allows options + to be given in any order, even with programs that were not written to + expect this. + + RETURN_IN_ORDER is an option available to programs that were written + to expect options and other ARGV-elements in any order and that care about + the ordering of the two. We describe each non-option ARGV-element + as if it were the argument of an option with character code 1. + Using `-' as the first character of the list of option characters + selects this mode of operation. + + The special argument `--' forces an end of option-scanning regardless + of the value of `ordering'. In the case of RETURN_IN_ORDER, only + `--' can cause `getopt' to return EOF with `optind' != ARGC. */ + +static enum +{ + REQUIRE_ORDER, PERMUTE, RETURN_IN_ORDER +} ordering; + +/* Value of POSIXLY_CORRECT environment variable. */ +static char *posixly_correct; + +#ifdef __GNU_LIBRARY__ +/* We want to avoid inclusion of string.h with non-GNU libraries + because there are many ways it can cause trouble. + On some systems, it contains special magic macros that don't work + in GCC. */ +#include +#define my_index strchr +#else + +/* Avoid depending on library functions or files + whose names are inconsistent. */ + +char *getenv (); + +static char * +my_index (str, chr) + const char *str; + int chr; +{ + while (*str) + { + if (*str == chr) + return (char *) str; + str++; + } + return 0; +} + +/* If using GCC, we can safely declare strlen this way. + If not using GCC, it is ok not to declare it. */ +#ifdef __GNUC__ +/* Note that Motorola Delta 68k R3V7 comes with GCC but not stddef.h. + That was relevant to code that was here before. */ +#ifndef __STDC__ +/* gcc with -traditional declares the built-in strlen to return int, + and has done so at least since version 2.4.5. -- rms. */ +extern int strlen (const char *); +#endif /* not __STDC__ */ +#endif /* __GNUC__ */ + +#endif /* not __GNU_LIBRARY__ */ + +/* Handle permutation of arguments. */ + +/* Describe the part of ARGV that contains non-options that have + been skipped. `first_nonopt' is the index in ARGV of the first of them; + `last_nonopt' is the index after the last of them. */ + +static int first_nonopt; +static int last_nonopt; + +/* Exchange two adjacent subsequences of ARGV. + One subsequence is elements [first_nonopt,last_nonopt) + which contains all the non-options that have been skipped so far. + The other is elements [last_nonopt,optind), which contains all + the options processed since those non-options were skipped. + + `first_nonopt' and `last_nonopt' are relocated so that they describe + the new indices of the non-options in ARGV after they are moved. */ + +static void +exchange (argv) + char **argv; +{ + int bottom = first_nonopt; + int middle = last_nonopt; + int top = optind; + char *tem; + + /* Exchange the shorter segment with the far end of the longer segment. + That puts the shorter segment into the right place. + It leaves the longer segment in the right place overall, + but it consists of two parts that need to be swapped next. */ + + while (top > middle && middle > bottom) + { + if (top - middle > middle - bottom) + { + /* Bottom segment is the short one. */ + int len = middle - bottom; + register int i; + + /* Swap it with the top part of the top segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[top - (middle - bottom) + i]; + argv[top - (middle - bottom) + i] = tem; + } + /* Exclude the moved bottom segment from further swapping. */ + top -= len; + } + else + { + /* Top segment is the short one. */ + int len = top - middle; + register int i; + + /* Swap it with the bottom part of the bottom segment. */ + for (i = 0; i < len; i++) + { + tem = argv[bottom + i]; + argv[bottom + i] = argv[middle + i]; + argv[middle + i] = tem; + } + /* Exclude the moved top segment from further swapping. */ + bottom += len; + } + } + + /* Update records for the slots the non-options now occupy. */ + + first_nonopt += (optind - last_nonopt); + last_nonopt = optind; +} + +/* Initialize the internal data when the first call is made. */ + +static const char * +_getopt_initialize (optstring) + const char *optstring; +{ + /* Start processing options with ARGV-element 1 (since ARGV-element 0 + is the program name); the sequence of previously skipped + non-option ARGV-elements is empty. */ + + first_nonopt = last_nonopt = optind = 1; + + nextchar = NULL; + + posixly_correct = getenv ("POSIXLY_CORRECT"); + + /* Determine how to handle the ordering of options and nonoptions. */ + + if (optstring[0] == '-') + { + ordering = RETURN_IN_ORDER; + ++optstring; + } + else if (optstring[0] == '+') + { + ordering = REQUIRE_ORDER; + ++optstring; + } + else if (posixly_correct != NULL) + ordering = REQUIRE_ORDER; + else + ordering = PERMUTE; + + return optstring; +} + +/* Scan elements of ARGV (whose length is ARGC) for option characters + given in OPTSTRING. + + If an element of ARGV starts with '-', and is not exactly "-" or "--", + then it is an option element. The characters of this element + (aside from the initial '-') are option characters. If `getopt' + is called repeatedly, it returns successively each of the option characters + from each of the option elements. + + If `getopt' finds another option character, it returns that character, + updating `optind' and `nextchar' so that the next call to `getopt' can + resume the scan with the following option character or ARGV-element. + + If there are no more option characters, `getopt' returns `EOF'. + Then `optind' is the index in ARGV of the first ARGV-element + that is not an option. (The ARGV-elements have been permuted + so that those that are not options now come last.) + + OPTSTRING is a string containing the legitimate option characters. + If an option character is seen that is not listed in OPTSTRING, + return '?' after printing an error message. If you set `opterr' to + zero, the error message is suppressed but we still return '?'. + + If a char in OPTSTRING is followed by a colon, that means it wants an arg, + so the following text in the same ARGV-element, or the text of the following + ARGV-element, is returned in `optarg'. Two colons mean an option that + wants an optional arg; if there is text in the current ARGV-element, + it is returned in `optarg', otherwise `optarg' is set to zero. + + If OPTSTRING starts with `-' or `+', it requests different methods of + handling the non-option ARGV-elements. + See the comments about RETURN_IN_ORDER and REQUIRE_ORDER, above. + + Long-named options begin with `--' instead of `-'. + Their names may be abbreviated as long as the abbreviation is unique + or is an exact match for some defined option. If they have an + argument, it follows the option name in the same ARGV-element, separated + from the option name by a `=', or else the in next ARGV-element. + When `getopt' finds a long-named option, it returns 0 if that option's + `flag' field is nonzero, the value of the option's `val' field + if the `flag' field is zero. + + The elements of ARGV aren't really const, because we permute them. + But we pretend they're const in the prototype to be compatible + with other systems. + + LONGOPTS is a vector of `struct option' terminated by an + element containing a name which is zero. + + LONGIND returns the index in LONGOPT of the long-named option found. + It is only valid when a long-named option has been found by the most + recent call. + + If LONG_ONLY is nonzero, '-' as well as '--' can introduce + long-named options. */ + +int +_getopt_internal (argc, argv, optstring, longopts, longind, long_only) + int argc; + char *const *argv; + const char *optstring; + const struct option *longopts; + int *longind; + int long_only; +{ + optarg = NULL; + + if (optind == 0) + optstring = _getopt_initialize (optstring); + + if (nextchar == NULL || *nextchar == '\0') + { + /* Advance to the next ARGV-element. */ + + if (ordering == PERMUTE) + { + /* If we have just processed some options following some non-options, + exchange them so that the options come first. */ + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (last_nonopt != optind) + first_nonopt = optind; + + /* Skip any additional non-options + and extend the range of non-options previously skipped. */ + + while (optind < argc + && (argv[optind][0] != '-' || argv[optind][1] == '\0')) + optind++; + last_nonopt = optind; + } + + /* The special ARGV-element `--' means premature end of options. + Skip it like a null option, + then exchange with previous non-options as if it were an option, + then skip everything else like a non-option. */ + + if (optind != argc && !strcmp (argv[optind], "--")) + { + optind++; + + if (first_nonopt != last_nonopt && last_nonopt != optind) + exchange ((char **) argv); + else if (first_nonopt == last_nonopt) + first_nonopt = optind; + last_nonopt = argc; + + optind = argc; + } + + /* If we have done all the ARGV-elements, stop the scan + and back over any non-options that we skipped and permuted. */ + + if (optind == argc) + { + /* Set the next-arg-index to point at the non-options + that we previously skipped, so the caller will digest them. */ + if (first_nonopt != last_nonopt) + optind = first_nonopt; + return EOF; + } + + /* If we have come to a non-option and did not permute it, + either stop the scan or describe it to the caller and pass it by. */ + + if ((argv[optind][0] != '-' || argv[optind][1] == '\0')) + { + if (ordering == REQUIRE_ORDER) + return EOF; + optarg = argv[optind++]; + return 1; + } + + /* We have found another option-ARGV-element. + Skip the initial punctuation. */ + + nextchar = (argv[optind] + 1 + + (longopts != NULL && argv[optind][1] == '-')); + } + + /* Decode the current option-ARGV-element. */ + + /* Check whether the ARGV-element is a long option. + + If long_only and the ARGV-element has the form "-f", where f is + a valid short option, don't consider it an abbreviated form of + a long option that starts with f. Otherwise there would be no + way to give the -f short option. + + On the other hand, if there's a long option "fubar" and + the ARGV-element is "-fu", do consider that an abbreviation of + the long option, just like "--fu", and not "-f" with arg "u". + + This distinction seems to be the most useful approach. */ + + if (longopts != NULL + && (argv[optind][1] == '-' + || (long_only && (argv[optind][2] || !my_index (optstring, argv[optind][1]))))) + { + char *nameend; + const struct option *p; + const struct option *pfound = NULL; + int exact = 0; + int ambig = 0; + int indfound; + int option_index; + + for (nameend = nextchar; *nameend && *nameend != '='; nameend++) + /* Do nothing. */ ; + + /* Test all long options for either exact match + or abbreviated matches. */ + for (p = longopts, option_index = 0; p->name; p++, option_index++) + if (!strncmp (p->name, nextchar, nameend - nextchar)) + { + if (nameend - nextchar == (int) strlen (p->name)) + { + /* Exact match found. */ + pfound = p; + indfound = option_index; + exact = 1; + break; + } + else if (pfound == NULL) + { + /* First nonexact match found. */ + pfound = p; + indfound = option_index; + } + else + /* Second or later nonexact match found. */ + ambig = 1; + } + + if (ambig && !exact) + { + if (opterr) + fprintf (stderr, "%s: option `%s' is ambiguous\n", + argv[0], argv[optind]); + nextchar += strlen (nextchar); + optind++; + return '?'; + } + + if (pfound != NULL) + { + option_index = indfound; + optind++; + if (*nameend) + { + /* Don't test has_arg with >, because some C compilers don't + allow it to be used on enums. */ + if (pfound->has_arg) + optarg = nameend + 1; + else + { + if (opterr) + { + if (argv[optind - 1][1] == '-') + /* --option */ + fprintf (stderr, + "%s: option `--%s' doesn't allow an argument\n", + argv[0], pfound->name); + else + /* +option or -option */ + fprintf (stderr, + "%s: option `%c%s' doesn't allow an argument\n", + argv[0], argv[optind - 1][0], pfound->name); + } + nextchar += strlen (nextchar); + return '?'; + } + } + else if (pfound->has_arg == 1) + { + if (optind < argc) + optarg = argv[optind++]; + else + { + if (opterr) + fprintf (stderr, "%s: option `%s' requires an argument\n", + argv[0], argv[optind - 1]); + nextchar += strlen (nextchar); + return optstring[0] == ':' ? ':' : '?'; + } + } + nextchar += strlen (nextchar); + if (longind != NULL) + *longind = option_index; + if (pfound->flag) + { + *(pfound->flag) = pfound->val; + return 0; + } + return pfound->val; + } + + /* Can't find it as a long option. If this is not getopt_long_only, + or the option starts with '--' or is not a valid short + option, then it's an error. + Otherwise interpret it as a short option. */ + if (!long_only || argv[optind][1] == '-' + || my_index (optstring, *nextchar) == NULL) + { + if (opterr) + { + if (argv[optind][1] == '-') + /* --option */ + fprintf (stderr, "%s: unrecognized option `--%s'\n", + argv[0], nextchar); + else + /* +option or -option */ + fprintf (stderr, "%s: unrecognized option `%c%s'\n", + argv[0], argv[optind][0], nextchar); + } + nextchar = (char *) ""; + optind++; + return '?'; + } + } + + /* Look at and handle the next short option-character. */ + + { + char c = *nextchar++; + char *temp = my_index (optstring, c); + + /* Increment `optind' when we start to process its last character. */ + if (*nextchar == '\0') + ++optind; + + if (temp == NULL || c == ':') + { + if (opterr) + { + if (posixly_correct) + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, "%s: illegal option -- %c\n", argv[0], c); + else + fprintf (stderr, "%s: invalid option -- %c\n", argv[0], c); + } + optopt = c; + return '?'; + } + if (temp[1] == ':') + { + if (temp[2] == ':') + { + /* This is an option that accepts an argument optionally. */ + if (*nextchar != '\0') + { + optarg = nextchar; + optind++; + } + else + optarg = NULL; + nextchar = NULL; + } + else + { + /* This is an option that requires an argument. */ + if (*nextchar != '\0') + { + optarg = nextchar; + /* If we end this ARGV-element by taking the rest as an arg, + we must advance to the next element now. */ + optind++; + } + else if (optind == argc) + { + if (opterr) + { + /* 1003.2 specifies the format of this message. */ + fprintf (stderr, "%s: option requires an argument -- %c\n", + argv[0], c); + } + optopt = c; + if (optstring[0] == ':') + c = ':'; + else + c = '?'; + } + else + /* We already incremented `optind' once; + increment it again when taking next ARGV-elt as argument. */ + optarg = argv[optind++]; + nextchar = NULL; + } + } + return c; + } +} + +int +getopt (argc, argv, optstring) + int argc; + char *const *argv; + const char *optstring; +{ + return _getopt_internal (argc, argv, optstring, + (const struct option *) 0, + (int *) 0, + 0); +} + +#endif /* _LIBC or not __GNU_LIBRARY__. */ + +#ifdef TEST + +/* Compile with -DTEST to make an executable for use in testing + the above definition of `getopt'. */ + +int +main (argc, argv) + int argc; + char **argv; +{ + int c; + int digit_optind = 0; + + while (1) + { + int this_option_optind = optind ? optind : 1; + + c = getopt (argc, argv, "abc:d:0123456789"); + if (c == EOF) + break; + + switch (c) + { + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + if (digit_optind != 0 && digit_optind != this_option_optind) + printf ("digits occur in two different argv-elements.\n"); + digit_optind = this_option_optind; + printf ("option %c\n", c); + break; + + case 'a': + printf ("option a\n"); + break; + + case 'b': + printf ("option b\n"); + break; + + case 'c': + printf ("option c with value `%s'\n", optarg); + break; + + case '?': + break; + + default: + printf ("?? getopt returned character code 0%o ??\n", c); + } + } + + if (optind < argc) + { + printf ("non-option ARGV-elements: "); + while (optind < argc) + printf ("%s ", argv[optind++]); + printf ("\n"); + } + + exit (0); +} + +#endif /* TEST */ diff -Naur WindowMaker-0.91.0/plugins/libwmfun/getopt.h wm/plugins/libwmfun/getopt.h --- WindowMaker-0.91.0/plugins/libwmfun/getopt.h 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/getopt.h 2000-12-03 21:58:41 +0300 @@ -0,0 +1,125 @@ +/* Declarations for getopt. + Copyright (C) 1989, 1990, 1991, 1992, 1993 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU General Public License as published by the + Free Software Foundation; either version 2, or (at your option) any + later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. */ + +#ifndef _GETOPT_H +#define _GETOPT_H 1 + +#ifdef __cplusplus +extern "C" { +#endif + +/* For communication from `getopt' to the caller. + When `getopt' finds an option that takes an argument, + the argument value is returned here. + Also, when `ordering' is RETURN_IN_ORDER, + each non-option ARGV-element is returned here. */ + +extern char *optarg; + +/* Index in ARGV of the next element to be scanned. + This is used for communication to and from the caller + and for communication between successive calls to `getopt'. + + On entry to `getopt', zero means this is the first call; initialize. + + When `getopt' returns EOF, this is the index of the first of the + non-option elements that the caller should itself scan. + + Otherwise, `optind' communicates from one call to the next + how much of ARGV has been scanned so far. */ + +extern int optind; + +/* Callers store zero here to inhibit the error message `getopt' prints + for unrecognized options. */ + +extern int opterr; + +/* Set to an option character which was unrecognized. */ + +extern int optopt; + +/* Describe the long-named options requested by the application. + The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector + of `struct option' terminated by an element containing a name which is + zero. + + The field `has_arg' is: + no_argument (or 0) if the option does not take an argument, + required_argument (or 1) if the option requires an argument, + optional_argument (or 2) if the option takes an optional argument. + + If the field `flag' is not NULL, it points to a variable that is set + to the value given in the field `val' when the option is found, but + left unchanged if the option is not found. + + To have a long-named option do something other than set an `int' to + a compiled-in constant, such as set a value from `optarg', set the + option's `flag' field to zero and its `val' field to a nonzero + value (the equivalent single-letter option character, if there is + one). For long options that have a zero `flag' field, `getopt' + returns the contents of the `val' field. */ + +struct option +{ +#if __STDC__ + const char *name; +#else + char *name; +#endif + /* has_arg can't be an enum because some compilers complain about + type mismatches in all the code that assumes it is an int. */ + int has_arg; + int *flag; + int val; +}; + +/* Names for the values of the `has_arg' field of `struct option'. */ + +#define no_argument 0 +#define required_argument 1 +#define optional_argument 2 + +#if __STDC__ +#if defined(__GNU_LIBRARY__) +/* Many other libraries have conflicting prototypes for getopt, with + differences in the consts, in stdlib.h. To avoid compilation + errors, only prototype getopt for the GNU C library. */ +extern int getopt (int argc, char *const *argv, const char *shortopts); +#else /* not __GNU_LIBRARY__ */ +extern int getopt (); +#endif /* not __GNU_LIBRARY__ */ +extern int getopt_long (int argc, char *const *argv, const char *shortopts, + const struct option *longopts, int *longind); +extern int getopt_long_only (int argc, char *const *argv, + const char *shortopts, + const struct option *longopts, int *longind); + +/* Internal only. Users should not call this directly. */ +extern int _getopt_internal (int argc, char *const *argv, + const char *shortopts, + const struct option *longopts, int *longind, + int long_only); +#else /* not __STDC__ */ +extern int getopt (); +extern int getopt_long (); +extern int getopt_long_only (); + +extern int _getopt_internal (); +#endif /* not __STDC__ */ + +#ifdef __cplusplus +} +#endif + +#endif /* _GETOPT_H */ diff -Naur WindowMaker-0.91.0/plugins/libwmfun/Makefile wm/plugins/libwmfun/Makefile --- WindowMaker-0.91.0/plugins/libwmfun/Makefile 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/Makefile 2001-07-27 00:15:10 +0400 @@ -0,0 +1,340 @@ +# Generated automatically from Makefile.in by configure. +# Makefile.in generated automatically by automake 1.4 from Makefile.am + +# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + +SHELL = /bin/sh + +srcdir = . +top_srcdir = .. +prefix = /usr/local +exec_prefix = ${prefix} + +bindir = ${exec_prefix}/bin +sbindir = ${exec_prefix}/sbin +libexecdir = ${exec_prefix}/libexec +datadir = ${prefix}/share +sysconfdir = ${prefix}/etc +sharedstatedir = ${prefix}/com +localstatedir = ${prefix}/var +libdir = ${exec_prefix}/lib +infodir = ${prefix}/info +mandir = ${prefix}/man +includedir = ${prefix}/include +oldincludedir = /usr/include + +DESTDIR = + +pkgdatadir = $(datadir)/libwmfun +pkglibdir = $(libdir)/libwmfun +pkgincludedir = $(includedir)/libwmfun + +top_builddir = .. + +ACLOCAL = aclocal +AUTOCONF = autoconf +AUTOMAKE = automake +AUTOHEADER = autoheader + +INSTALL = /usr/bin/ginstall -c +INSTALL_PROGRAM = ${INSTALL} $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_SCRIPT = ${INSTALL_PROGRAM} +transform = s,x,x, + +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +host_alias = i686-pc-linux +host_triplet = i686-pc-linux-gnu +AS = @AS@ +CC = gcc +DLLTOOL = @DLLTOOL@ +LIBTOOL = $(SHELL) $(top_builddir)/libtool +LN_S = ln -s +MAKEINFO = makeinfo +OBJDUMP = @OBJDUMP@ +PACKAGE = libwmfun +RANLIB = ranlib +VERSION = 0.0.4 + +lib_LTLIBRARIES = libwmfun.la + +libwmfun_la_LDFLAGS = -version-info 1:0:1 + +libwmfun_la_SOURCES = bilinear.c fade.c generic.c generic.h getopt.c getopt.h getopt1.c wave.c + +mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs +CONFIG_HEADER = config.h +CONFIG_CLEAN_FILES = +LTLIBRARIES = $(lib_LTLIBRARIES) + + +DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I. +CPPFLAGS = +LDFLAGS = +LIBS = +libwmfun_la_LIBADD = +libwmfun_la_OBJECTS = bilinear.lo fade.lo generic.lo getopt.lo \ +getopt1.lo wave.lo +CFLAGS = -g -O2 +COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +CCLD = $(CC) +LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ +DIST_COMMON = ./stamp-h.in Makefile.am Makefile.in config.h.in + + +DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) + +TAR = tar +GZIP_ENV = --best +SOURCES = $(libwmfun_la_SOURCES) +OBJECTS = $(libwmfun_la_OBJECTS) + +all: all-redirect +.SUFFIXES: +.SUFFIXES: .S .c .lo .o .s +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps libwmfun/Makefile + +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + + +config.h: stamp-h + @if test ! -f $@; then \ + rm -f stamp-h; \ + $(MAKE) stamp-h; \ + else :; fi +stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status + cd $(top_builddir) \ + && CONFIG_FILES= CONFIG_HEADERS=libwmfun/config.h \ + $(SHELL) ./config.status + @echo timestamp > stamp-h 2> /dev/null +$(srcdir)/config.h.in: $(srcdir)/stamp-h.in + @if test ! -f $@; then \ + rm -f $(srcdir)/stamp-h.in; \ + $(MAKE) $(srcdir)/stamp-h.in; \ + else :; fi +$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOHEADER) + @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null + +mostlyclean-hdr: + +clean-hdr: + +distclean-hdr: + -rm -f config.h + +maintainer-clean-hdr: + +mostlyclean-libLTLIBRARIES: + +clean-libLTLIBRARIES: + -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) + +distclean-libLTLIBRARIES: + +maintainer-clean-libLTLIBRARIES: + +install-libLTLIBRARIES: $(lib_LTLIBRARIES) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(libdir) + @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + if test -f $$p; then \ + echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ + $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ + else :; fi; \ + done + +uninstall-libLTLIBRARIES: + @$(NORMAL_UNINSTALL) + list='$(lib_LTLIBRARIES)'; for p in $$list; do \ + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ + done + +.c.o: + $(COMPILE) -c $< + +.s.o: + $(COMPILE) -c $< + +.S.o: + $(COMPILE) -c $< + +mostlyclean-compile: + -rm -f *.o core *.core + +clean-compile: + +distclean-compile: + -rm -f *.tab.c + +maintainer-clean-compile: + +.c.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.s.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +.S.lo: + $(LIBTOOL) --mode=compile $(COMPILE) -c $< + +mostlyclean-libtool: + -rm -f *.lo + +clean-libtool: + -rm -rf .libs _libs + +distclean-libtool: + +maintainer-clean-libtool: + +libwmfun.la: $(libwmfun_la_OBJECTS) $(libwmfun_la_DEPENDENCIES) + $(LINK) -rpath $(libdir) $(libwmfun_la_LDFLAGS) $(libwmfun_la_OBJECTS) $(libwmfun_la_LIBADD) $(LIBS) + +tags: TAGS + +ID: $(HEADERS) $(SOURCES) $(LISP) + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + here=`pwd` && cd $(srcdir) \ + && mkid -f$$here/ID $$unique $(LISP) + +TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS)'; \ + unique=`for i in $$list; do echo $$i; done | \ + awk ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ + || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS) + +mostlyclean-tags: + +clean-tags: + +distclean-tags: + -rm -f TAGS ID + +maintainer-clean-tags: + +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) + +subdir = libwmfun + +distdir: $(DISTFILES) + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ + cp -pr $$d/$$file $(distdir)/$$file; \ + else \ + test -f $(distdir)/$$file \ + || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ + || cp -p $$d/$$file $(distdir)/$$file || :; \ + fi; \ + done +info-am: +info: info-am +dvi-am: +dvi: dvi-am +check-am: all-am +check: check-am +installcheck-am: +installcheck: installcheck-am +all-recursive-am: config.h + $(MAKE) $(AM_MAKEFLAGS) all-recursive + +install-exec-am: install-libLTLIBRARIES +install-exec: install-exec-am + +install-data-am: +install-data: install-data-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +install: install-am +uninstall-am: uninstall-libLTLIBRARIES +uninstall: uninstall-am +all-am: Makefile $(LTLIBRARIES) config.h +all-redirect: all-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +installdirs: + $(mkinstalldirs) $(DESTDIR)$(libdir) + + +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -rm -f Makefile $(CONFIG_CLEAN_FILES) + -rm -f config.cache config.log stamp-h stamp-h[0-9]* + +maintainer-clean-generic: +mostlyclean-am: mostlyclean-hdr mostlyclean-libLTLIBRARIES \ + mostlyclean-compile mostlyclean-libtool \ + mostlyclean-tags mostlyclean-generic + +mostlyclean: mostlyclean-am + +clean-am: clean-hdr clean-libLTLIBRARIES clean-compile clean-libtool \ + clean-tags clean-generic mostlyclean-am + +clean: clean-am + +distclean-am: distclean-hdr distclean-libLTLIBRARIES distclean-compile \ + distclean-libtool distclean-tags distclean-generic \ + clean-am + -rm -f libtool + +distclean: distclean-am + +maintainer-clean-am: maintainer-clean-hdr \ + maintainer-clean-libLTLIBRARIES \ + maintainer-clean-compile maintainer-clean-libtool \ + maintainer-clean-tags maintainer-clean-generic \ + distclean-am + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + +maintainer-clean: maintainer-clean-am + +.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ +clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ +uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ +distclean-compile clean-compile maintainer-clean-compile \ +mostlyclean-libtool distclean-libtool clean-libtool \ +maintainer-clean-libtool tags mostlyclean-tags distclean-tags \ +clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \ +check-am installcheck-am installcheck all-recursive-am install-exec-am \ +install-exec install-data-am install-data install-am install \ +uninstall-am uninstall all-redirect all-am all installdirs \ +mostlyclean-generic distclean-generic clean-generic \ +maintainer-clean-generic clean mostlyclean distclean maintainer-clean + + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff -Naur WindowMaker-0.91.0/plugins/libwmfun/wave.c wm/plugins/libwmfun/wave.c --- WindowMaker-0.91.0/plugins/libwmfun/wave.c 1970-01-01 03:00:00 +0300 +++ wm/plugins/libwmfun/wave.c 2000-12-03 21:58:41 +0300 @@ -0,0 +1,134 @@ +/* + * libwmfun - WindowMaker texture function library + * Copyright (C) 1999 Tobias Gloth + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + +/* + * $Id: wave.c,v 1.1 2000/12/03 18:58:41 id Exp $ + * + * $Log: wave.c,v $ + * Revision 1.1 2000/12/03 18:58:41 id + * initiate plugins branch + * + * Revision 1.1.1.1 1999/02/21 17:16:47 gloth + * initial revision + * + */ + +#include "getopt.h" +#include +#include +#include +#include "generic.h" + +RImage *waves (int argc, char **argv, int width, int height, int relief) { + + int i, j, k, done, sine [256]; + int from[3] = { 0x00, 0x00, 0x00 }; + int to[3] = { 0xff, 0xff, 0xff }; + int layers, range, dx[1000], dy[1000]; + RImage *image; + unsigned char *cptr; + + int option_index = 0; + int c; + + optind = 1; + for (done=0; !done; ) { + static struct option long_options[] = { + {"from", 1, 0, 'f'}, + {"to", 1, 0, 't'}, + {0, 0, 0, 0} + }; + + c = getopt_long (argc, argv, "f:t:", + long_options, &option_index); + if (c == -1) { + break; + } + + switch (c) { + case 'f': + if (!parse_color (optarg, from)) { + error ("invalid color: %s\n", optarg); + return 0; + } + break; + case 't': + if (!parse_color (optarg, to)) { + error ("invalid color: %s\n", optarg); + return 0; + } + break; + default: + done = 1; + break; + } + } + + argc -= optind; + argv += optind; + + if (!start_image ("waves", argc, 2, 3, width, height, &image)) { + return (RImage *)0; + } + + layers = atoi (argv[0]); + range = atoi (argv[1]); + + if (layers <= 0) { + layers = 1; + } + if (layers > 256) { + layers = 256; + } + + if (range <= 0) { + range = 1; + } + + for (i=0; i<256; i++) { + sine[i] = (int) (127.0 * sin (2.0 * M_PI * i / 256)) + 128; + } + + srand (time (0)); + + for (i=0; idata; + for (i=0; iformat ) + cptr++; + } + } + + return image; +} + diff -Naur WindowMaker-0.91.0/po/CVS/Entries wm/po/CVS/Entries --- WindowMaker-0.91.0/po/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/po/CVS/Entries 2005-05-17 22:43:27 +0400 @@ -0,0 +1,34 @@ +/.cvsignore/1.6/Wed Apr 2 11:37:10 2003// +/Makefile.am/1.29/Tue Oct 26 20:03:06 2004// +/README/1.39/Sun Oct 17 03:31:22 2004// +/be.po/1.3/Tue Oct 26 03:44:08 2004// +/bg.po/1.5/Sun Oct 17 03:31:22 2004// +/bs.po/1.3/Sun Oct 17 05:05:57 2004// +/ca.po/1.3/Sun Oct 17 03:31:22 2004// +/cs.po/1.14/Sun Oct 17 03:31:22 2004// +/da.po/1.7/Sun Oct 17 03:31:22 2004// +/de.po/1.15/Tue Oct 26 03:44:08 2004// +/el.po/1.7/Sun Oct 17 03:31:22 2004// +/es.po/1.6/Sun Oct 17 03:31:22 2004// +/et.po/1.11/Tue Oct 26 03:44:08 2004// +/fi.po/1.9/Sun Oct 17 03:31:22 2004// +/fr.po/1.11/Sun Oct 17 03:31:22 2004// +/gl.po/1.4/Sun Oct 17 03:31:22 2004// +/hr.po/1.5/Sun Oct 17 03:31:22 2004// +/hu.po/1.4/Sun Oct 17 03:31:22 2004// +/it.po/1.10/Fri Mar 4 23:47:09 2005// +/ja.po/1.7/Tue Oct 26 20:03:06 2004// +/ko.po/1.17/Tue Oct 26 03:44:08 2004// +/ms.po/1.3/Tue Oct 26 03:44:08 2004// +/nl.po/1.4/Tue Oct 26 03:44:08 2004// +/no.po/1.4/Sun Oct 17 03:31:22 2004// +/pl.po/1.5/Sun Oct 17 03:31:22 2004// +/pt.po/1.8/Sun Oct 17 03:31:22 2004// +/ro.po/1.5/Tue Oct 26 03:44:08 2004// +/ru.po/1.7/Sun Oct 17 03:31:22 2004// +/sk.po/1.9/Sun Oct 17 03:31:22 2004// +/sv.po/1.4/Tue Oct 26 03:44:08 2004// +/tr.po/1.5/Tue Oct 26 03:44:08 2004// +/zh_CN.po/1.6/Tue Oct 26 03:44:08 2004// +/zh_TW.po/1.2/Fri Jan 21 04:05:48 2005// +D diff -Naur WindowMaker-0.91.0/po/CVS/Repository wm/po/CVS/Repository --- WindowMaker-0.91.0/po/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/po/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/po diff -Naur WindowMaker-0.91.0/po/CVS/Root wm/po/CVS/Root --- WindowMaker-0.91.0/po/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/po/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/po/.cvsignore wm/po/.cvsignore --- WindowMaker-0.91.0/po/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/po/.cvsignore 2003-04-02 15:37:10 +0400 @@ -0,0 +1,4 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt +*.pot +*.mo diff -Naur WindowMaker-0.91.0/po/it.po wm/po/it.po --- WindowMaker-0.91.0/po/it.po 2004-10-26 07:52:38 +0400 +++ wm/po/it.po 2005-03-05 02:47:09 +0300 @@ -1,39 +1,39 @@ -# File dei messaggi in italiano per WindowMaker -# Italian message file for WindowMaker -# Copyright (C) 2001 Free Software Foundation, Inc. -# +# Italian messages for windowmaker. +# Copyright (C) 2001, 2005 Free Software Foundation, Inc. +# This file is distributed under the same license as the windowmaker package. +# Marco Colombo , 2005. # Michele Campeotto , 2001. # msgid "" msgstr "" -"Project-Id-Version: WindowMaker 0.65\n" -"POT-Creation-Date: 2001-05-21 11:56+0200\n" -"PO-Revision-Date: 2001-05-21\n" -"Last-Translator: Michele Campeotto \n" -"Language-Team: Italian \n" +"Project-Id-Version: WindowMaker 0.91\n" +"POT-Creation-Date: 2005-03-04 15:31+0000\n" +"PO-Revision-Date: 2005-03-04 16:33+0000\n" +"Last-Translator: Marco Colombo \n" +"Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: unknown\n" +"Content-Transfer-Encoding: 8bit\n" -#: ../src/appicon.c:542 ../src/dialog.c:224 ../src/dock.c:3243 -#: ../src/dockedapp.c:211 ../src/main.c:255 ../src/rootmenu.c:1789 -#: ../src/winspector.c:387 ../src/winspector.c:403 +#: ../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 "Errore" -#: ../src/appicon.c:543 +#: ../src/appicon.c:416 msgid "Could not open specified icon file" -msgstr "Impossibile aprire l'cona specificata" +msgstr "Impossibile aprire l'icona specificata" -#: ../src/appicon.c:544 ../src/dialog.c:121 ../src/dialog.c:224 -#: ../src/dialog.c:669 ../src/dialog.c:1719 ../src/dock.c:493 -#: ../src/dock.c:501 ../src/dock.c:525 ../src/dock.c:3244 -#: ../src/dockedapp.c:212 ../src/dockedapp.c:370 ../src/main.c:255 -#: ../src/rootmenu.c:1793 ../src/winspector.c:388 ../src/winspector.c:404 +#: ../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:571 ../src/dock.c:256 +#: ../src/appicon.c:445 ../src/dock.c:244 msgid "" " will be forcibly closed.\n" "Any unsaved changes will be lost.\n" @@ -43,411 +43,475 @@ "Tutte le modifiche non salvate saranno perse.\n" "Confermare." -#: ../src/appicon.c:577 ../src/dock.c:261 ../src/winmenu.c:128 +#: ../src/appicon.c:453 ../src/dock.c:263 ../src/winmenu.c:124 msgid "Kill Application" -msgstr "Uccidi l'applicazione" +msgstr "Termina l'applicazione" -#: ../src/appicon.c:578 ../src/dock.c:262 ../src/winmenu.c:130 +#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126 msgid "Yes" msgstr "Sì" -#: ../src/appicon.c:578 ../src/dock.c:262 ../src/winmenu.c:130 +#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126 msgid "No" msgstr "No" -#: ../src/appicon.c:596 ../src/dock.c:1139 ../src/dock.c:3409 +#: ../src/appicon.c:484 ../src/dock.c:1168 ../src/dock.c:3501 msgid "Unhide Here" msgstr "Mostra qui" -#: ../src/appicon.c:597 ../src/appicon.c:623 ../src/dock.c:1141 -#: ../src/dock.c:1143 ../src/dock.c:3421 ../src/winmenu.c:463 +#: ../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 "Nascondi" -#: ../src/appicon.c:598 ../src/appicon.c:629 -msgid "Collapse" -msgstr "Collassa" - -#: ../src/appicon.c:599 +#: ../src/appicon.c:486 msgid "Set Icon..." msgstr "Cambia icona..." -#: ../src/appicon.c:600 ../src/dock.c:1147 ../src/rootmenu.c:223 -#: ../src/rootmenu.c:237 ../src/winmenu.c:510 +#: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248 +#: ../src/rootmenu.c:264 ../src/winmenu.c:508 msgid "Kill" -msgstr "Uccidi" +msgstr "Termina" -#: ../src/appicon.c:621 ../src/dock.c:3419 +#: ../src/appicon.c:508 ../src/dock.c:3511 msgid "Unhide" msgstr "Mostra" -#: ../src/appicon.c:627 -msgid "Uncollapse" -msgstr "Espandi" +#: ../src/application.c:405 +#, c-format +msgid "recreating missing icon '%s'" +msgstr "rigenerazione dell'icona mancante '%s'" + +#: ../src/defaults.c:933 ../src/defaults.c:1095 +#, c-format +msgid "Domain %s (%s) of global defaults database is corrupted!" +msgstr "Il dominio %s (%s) del database globale dei default è rovinato!" -#: ../src/defaults.c:914 ../src/startup.c:879 ../src/startup.c:897 -#: ../src/startup.c:903 +#: ../src/defaults.c:938 +#, c-format +msgid "could not load domain %s from global defaults database" +msgstr "impossibile leggere il dominio \"%s\" dal database globale dei default" + +#: ../src/defaults.c:990 ../src/defaults.c:1005 +#, c-format +msgid "invalid global menu file %s" +msgstr "file di menù globale %s non valido" + +#: ../src/defaults.c:1033 ../src/startup.c:762 ../src/startup.c:780 +#: ../src/startup.c:787 #, c-format msgid "could not read domain \"%s\" from defaults database" -msgstr "Impossibile leggere il dominio \"%s\" dal database dei default" +msgstr "impossibile leggere il dominio \"%s\" dal database dei default" -#: ../src/defaults.c:960 ../src/defaults.c:1085 ../src/defaults.c:1124 -#: ../src/defaults.c:1170 +#: ../src/defaults.c:1079 ../src/defaults.c:1184 ../src/defaults.c:1225 +#: ../src/defaults.c:1281 #, c-format msgid "Domain %s (%s) of defaults database is corrupted!" msgstr "Il dominio %s (%s) del database dei default è rovinato!" -#: ../src/defaults.c:965 ../src/defaults.c:1106 ../src/defaults.c:1153 -#: ../src/defaults.c:1179 +#: ../src/defaults.c:1084 ../src/defaults.c:1204 ../src/defaults.c:1261 +#: ../src/defaults.c:1291 #, c-format msgid "could not load domain %s from user defaults database" -msgstr "" -"Impossibile leggere il dominio \"%s\" dal database personale dei default" +msgstr "impossibile leggere il dominio \"%s\" dal database personale dei default" -#: ../src/defaults.c:976 ../src/defaults.c:1070 +#: ../src/defaults.c:1114 #, c-format -msgid "Domain %s (%s) of global defaults database is corrupted!" -msgstr "Il dominio %s (%s) del database globale dei default è rovinato!" +msgid "could not load domain %s from global defaults database (%s)" +msgstr "impossibile leggere il dominio \"%s\" dal database globale dei default (%s)" -#: ../src/defaults.c:995 +#: ../src/defaults.c:1251 ../src/screen.c:419 #, c-format -msgid "could not load domain %s from global defaults database (%s)" -msgstr "" -"Impossibile leggere il dominio \"%s\" dal database globale dei default (%s)" +msgid "could not load logo image for panels: %s" +msgstr "impossibile caricare il logo per i pannelli: %s" -#: ../src/defaults.c:1075 +#. --------------------------- Local ----------------------- +#: ../src/defaults.c:1500 ../src/defaults.c:1639 ../src/defaults.c:1765 +#: ../src/defaults.c:2243 ../src/defaults.c:2260 ../src/defaults.c:2305 +#: ../src/defaults.c:2352 ../src/defaults.c:2825 ../src/wdefaults.c:571 +#: ../src/wdefaults.c:604 #, c-format -msgid "could not load domain %s from global defaults database" -msgstr "Impossibile leggere il dominio \"%s\" dal database globale dei default" +msgid "Wrong option format for key \"%s\". Should be %s." +msgstr "Formato dell'opzione sbagliato per la chiave \"%s\". Deve essere %s." -#: ../src/defaults.c:1143 ../src/screen.c:458 +#: ../src/defaults.c:1502 ../src/defaults.c:1583 ../src/defaults.c:1613 +#: ../src/defaults.c:1644 ../src/defaults.c:1657 ../src/defaults.c:1672 +#: ../src/defaults.c:1686 ../src/defaults.c:1770 ../src/defaults.c:1782 +#: ../src/defaults.c:2248 ../src/defaults.c:2265 ../src/defaults.c:2278 +#: ../src/defaults.c:2310 ../src/defaults.c:2326 ../src/defaults.c:2357 +#: ../src/defaults.c:2444 ../src/defaults.c:2830 ../src/defaults.c:2841 #, c-format -msgid "could not load logo image for panels: %s" -msgstr "Impossibile caricare il logo per i pannelli: %s" +msgid "using default \"%s\" instead" +msgstr "viene usato il valore predefinito \"%s\" invece" -#: ../src/defaults.c:1421 +#: ../src/defaults.c:1533 #, c-format msgid "wrong option value for key \"%s\". Should be one of %s" -msgstr "Opzione sbagliata per la chiave \"%s\". Deve essere una di %s" +msgstr "opzione sbagliata per la chiave \"%s\". Deve essere una di %s" -#: ../src/defaults.c:1466 +#: ../src/defaults.c:1578 #, c-format msgid "can't convert \"%s\" to boolean for key \"%s\"" -msgstr "Impossibile convertire \"%s\" in booleano per la chiave \"%s\"" +msgstr "impossibile convertire \"%s\" in booleano per la chiave \"%s\"" -#: ../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:2710 ../src/defaults.c:2721 -#, c-format -msgid "using default \"%s\" instead" -msgstr "Uso il valore predefinito \"%s\"" - -#: ../src/defaults.c:1500 +#: ../src/defaults.c:1610 #, c-format msgid "can't convert \"%s\" to integer for key \"%s\"" -msgstr "Impossibile convertire \"%s\" in intero per la chiave \"%s\"" - -#: ../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:2705 ../src/wdefaults.c:570 ../src/wdefaults.c:606 -#, c-format -msgid "Wrong option format for key \"%s\". Should be %s." -msgstr "Formato dell'opzione sbagliato per la chiave \"%s\". Deve essere %s." +msgstr "impossibile convertire \"%s\" in intero per la chiave \"%s\"" -#: ../src/defaults.c:1543 +#: ../src/defaults.c:1652 #, c-format msgid "Incorrect number of elements in array for key \"%s\"." msgstr "Numero di elementi dell'array sbagliato per la chiave \"%s\"." -#: ../src/defaults.c:1558 +#: ../src/defaults.c:1667 #, c-format msgid "Wrong value for key \"%s\". Should be Coordinate." msgstr "Valore errato per la chiave \"%s\". Devono essere delle coordinate." -#: ../src/defaults.c:1573 +#: ../src/defaults.c:1682 #, c-format msgid "can't convert array to integers for \"%s\"." -msgstr "Impossibile convertire l'array ad interi per \"%s\"." +msgstr "impossibile convertire l'array in interi per \"%s\"." -#: ../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:1715 +#, c-format +msgid "Wrong value for key \"%s\". Should be an array." +msgstr "Valore errato per la chiave \"%s\". Deve essere un array." + +#: ../src/defaults.c:1893 ../src/defaults.c:1925 ../src/defaults.c:1941 +#: ../src/defaults.c:1970 ../src/defaults.c:1993 ../src/defaults.c:2046 +#: ../src/defaults.c:2086 ../src/defaults.c:2124 ../src/defaults.c:2140 #, c-format msgid "\"%s\" is not a valid color name" msgstr "\"%s\" non è un nome di colore valido" -#: ../src/defaults.c:1784 ../src/defaults.c:1836 +#: ../src/defaults.c:1906 ../src/defaults.c:1958 msgid "bad number of arguments in gradient specification" -msgstr "Numero errato di argomenti nella definizione della sfumatura" +msgstr "numero errato di argomenti nella definizione della sfumatura" -#: ../src/defaults.c:1897 +#: ../src/defaults.c:2019 msgid "too few arguments in multicolor gradient specification" -msgstr "Mancano argomenti nella definizione della sfumatura multicolore" +msgstr "argomenti mancanti nella definizione della sfumatura multicolore" -#: ../src/defaults.c:1991 +#: ../src/defaults.c:2113 msgid "bad number of arguments in textured gradient specification" -msgstr "" -"Numero errato di argomenti nella definizione della sfumatura con trama" +msgstr "numero errato di argomenti nella definizione della sfumatura con trama" -#: ../src/defaults.c:2034 +# FIXME UPSTREAM: tgradient -> the gradient REPORTED +#: ../src/defaults.c:2156 #, c-format msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]" -msgstr "" -"Valore di opacità errato per la sfumatura con trama \"%s\". Deve essere " -"[0..255]" +msgstr "valore di opacità errato per la sfumatura con trama \"%s\". Deve essere [0..255]" -#: ../src/defaults.c:2094 +#: ../src/defaults.c:2216 #, c-format msgid "could not initialize library %s" -msgstr "Impossibile inizializzare la libreria %s" +msgstr "impossibile inizializzare la libreria %s" -#: ../src/defaults.c:2097 +#: ../src/defaults.c:2219 #, c-format msgid "could not find function %s::%s" -msgstr "Non trovo la funzione %s::%s" +msgstr "impossibile trovare la funzione %s::%s" -#: ../src/defaults.c:2104 +#: ../src/defaults.c:2226 #, c-format msgid "invalid texture type %s" -msgstr "Tipo di trama non valido %s" +msgstr "tipo di trama non valido %s" -#: ../src/defaults.c:2151 +#: ../src/defaults.c:2273 #, c-format msgid "Error in texture specification for key \"%s\"" msgstr "Errore nella definizione della trama per la chiave \"%s\"" -#: ../src/defaults.c:2200 +#: ../src/defaults.c:2322 msgid "Wrong type for workspace background. Should be a texture type." msgstr "" "Tipo errato per lo sfondo dell'area di lavoro. Deve essere un tipo di trama." -#: ../src/defaults.c:2248 +#: ../src/defaults.c:2370 #, c-format msgid "Wrong type for background of workspace %i. Should be a texture." msgstr "" "Tipo errato per lo sfondo dell'area di lavoro %i. Deve essere una trama." -#: ../src/defaults.c:2290 +#: ../src/defaults.c:2412 msgid "could not load any usable font!!!" -msgstr "Impossibile caricare un font utilizzabile!!!" +msgstr "impossibile caricare un font utilizzabile" -#: ../src/defaults.c:2317 +#: ../src/defaults.c:2439 #, c-format msgid "could not get color for key \"%s\"" -msgstr "Non trovo il colore per la chiave \"%s\"" +msgstr "impossibile trovare il colore per la chiave \"%s\"" -#: ../src/defaults.c:2375 ../src/rootmenu.c:489 +# FIXME UPSTREAM +#: ../src/defaults.c:2497 ../src/rootmenu.c:531 #, c-format msgid "%s:invalid key modifier \"%s\"" msgstr "%s: modificatore di tasto non valido \"%s\"" -#: ../src/defaults.c:2387 +# FIXME UPSTREAM +#: ../src/defaults.c:2509 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\"" msgstr "%s: definizione di scorciatoia non valida \"%s\"" -#: ../src/defaults.c:2394 +# FIXME UPSTREAM +#: ../src/defaults.c:2516 #, c-format msgid "%s:invalid key in shortcut \"%s\"" msgstr "%s: tasto non valido nella scorciatoia \"%s\"" -#: ../src/defaults.c:2419 +#: ../src/defaults.c:2541 #, c-format msgid "%s: modifier key %s is not valid" msgstr "%s: il tasto modificatore %s non è valido" -#: ../src/defaults.c:2451 +#: ../src/defaults.c:2573 #, c-format msgid "could not load image in option %s: %s" -msgstr "Impossibile caricare l'immagine nell'opzione %s: %s" +msgstr "impossibile caricare l'immagine nell'opzione %s: %s" -#: ../src/defaults.c:2570 +#: ../src/defaults.c:2690 #, c-format msgid "failed to open bitmap file \"%s\"" -msgstr "Fallita l'apertura del file bitmap \"%s\"" +msgstr "apertura del file bitmap \"%s\" non riuscita" -#: ../src/defaults.c:2573 +#: ../src/defaults.c:2693 #, c-format msgid "\"%s\" is not a valid bitmap file" msgstr "\"%s\" non è un file bitmap valido" -#: ../src/defaults.c:2576 +#: ../src/defaults.c:2696 #, c-format msgid "out of memory reading bitmap file \"%s\"" -msgstr "Memoria esaurita leggendo il file bitmap \"%s\"" +msgstr "memoria esaurita leggendo il file bitmap \"%s\"" -#: ../src/defaults.c:2615 ../src/defaults.c:2648 +#: ../src/defaults.c:2735 ../src/defaults.c:2768 msgid "bad number of arguments in cursor specification" -msgstr "Numero di argomenti errato nella definizione del cursore" +msgstr "numero di argomenti errato nella definizione del cursore" -#: ../src/defaults.c:2631 +#: ../src/defaults.c:2751 #, c-format msgid "unknown builtin cursor name \"%s\"" -msgstr "Nome di cursore incorporato sconosciuto \"%s\"" +msgstr "nome di cursore incorporato sconosciuto \"%s\"" -#: ../src/defaults.c:2658 ../src/defaults.c:2670 +#: ../src/defaults.c:2778 ../src/defaults.c:2790 #, c-format msgid "could not find cursor bitmap file \"%s\"" -msgstr "Impossibile trovare il file bitmap \"%s\" del cursore" +msgstr "impossibile trovare il file bitmap \"%s\" del cursore" -#: ../src/defaults.c:2717 +#: ../src/defaults.c:2837 #, c-format msgid "Error in cursor specification for key \"%s\"" msgstr "Errore nella definizione del cursore per la chiave \"%s\"" -#: ../src/defaults.c:2804 +#: ../src/defaults.c:2922 msgid "could not render texture for icon background" -msgstr "Impossibile generare la trama per lo sfondo dell'icona" +msgstr "impossibile generare la trama per lo sfondo dell'icona" -#: ../src/dialog.c:121 ../src/dialog.c:676 ../src/dock.c:525 -#: ../src/dockedapp.c:376 ../src/rootmenu.c:185 ../src/rootmenu.c:223 -#: ../src/rootmenu.c:237 +#: ../src/defaults.c:3542 ../src/defaults.c:3617 +#, c-format +msgid "Invalid arguments for option \"%s\"" +msgstr "Argomenti non validi per l'opzione \"%s\"" + +#: ../src/defaults.c:3549 ../src/defaults.c:3624 +#, c-format +msgid "Could not find image \"%s\" for option \"%s\"" +msgstr "Impossibile trovare l'immagine \"%s\" per l'opzione \"%s\"" + +#: ../src/defaults.c:3555 ../src/defaults.c:3632 +#, c-format +msgid "Could not load image \"%s\" for option \"%s\"" +msgstr "Impossibile caricare l'immagine \"%s\" per l'opzione \"%s\"" + +#: ../src/defaults.c:3567 +msgid "Invalid split sizes for SwitchPanel back image." +msgstr "" + +#: ../src/defaults.c:3640 +#, c-format +msgid "Invalid number of arguments for option \"%s\"" +msgstr "Numero di argomenti non valido per l'opzione \"%s\"" + +#: ../src/dialog.c:147 +msgid "Save workspace state" +msgstr "Salva l'area di lavoro" + +#: ../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 "Annulla" -#: ../src/dialog.c:219 +#: ../src/dialog.c:290 msgid "Could not open directory " msgstr "Impossibile aprire la directory " -#: ../src/dialog.c:274 +#: ../src/dialog.c:345 msgid "Could not load image file " msgstr "Impossibile caricare il file immagine " -#: ../src/dialog.c:603 +#: ../src/dialog.c:659 msgid "Directories" msgstr "Directory" -#: ../src/dialog.c:612 +#: ../src/dialog.c:668 msgid "Icons" msgstr "Icone" -#: ../src/dialog.c:645 +#: ../src/dialog.c:701 msgid "Preview" msgstr "Anteprima" -#: ../src/dialog.c:658 +#: ../src/dialog.c:714 msgid "File Name:" msgstr "Nome file:" -#: ../src/dialog.c:682 +#: ../src/dialog.c:738 msgid "Choose File" msgstr "Selezione del file" -#: ../src/dialog.c:699 ../src/dialog.c:701 +#: ../src/dialog.c:757 ../src/dialog.c:759 msgid "Icon Chooser" msgstr "Selezione dell'icona" -#: ../src/dialog.c:1156 ../src/dialog.c:1266 +#: ../src/dialog.c:1196 ../src/dialog.c:1304 #, c-format msgid "Version %s" msgstr "Versione %s" -#: ../src/dialog.c:1263 +#: ../src/dialog.c:1302 msgid "Window Manager for X" msgstr "Gestore di finestre per X" -#: ../src/dialog.c:1287 -msgid "32 thousand" -msgstr "32 mila" +#: ../src/dialog.c:1325 +#, c-format +msgid "Using visual 0x%x: %s %ibpp " +msgstr "Si sta usando la visual 0x%x: %s %ibpp" -#: ../src/dialog.c:1290 -msgid "64 thousand" -msgstr "64 mila" +#: ../src/dialog.c:1333 +msgid "(32 thousand colors)\n" +msgstr "(32 mila colori)\n" -#: ../src/dialog.c:1294 -msgid "16 million" -msgstr "16 milioni" +#: ../src/dialog.c:1336 +msgid "(64 thousand colors)\n" +msgstr "(64 mila colori)\n" -#: ../src/dialog.c:1301 +#: ../src/dialog.c:1340 +msgid "(16 million colors)\n" +msgstr "(16 milioni di colori)\n" + +#: ../src/dialog.c:1343 #, c-format -msgid "Using visual 0x%x: %s %ibpp (%s colors)\n" -msgstr "Sto usando la visual 0x%x: %s %ibpp (%s colori)\n" +msgid "(%d colors)\n" +msgstr "(%d colori)\n" -#: ../src/dialog.c:1309 +#: ../src/dialog.c:1353 #, c-format msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n" msgstr "Memoria allocata: %i kB. Memoria utilizzata: %i kB.\n" -#: ../src/dialog.c:1315 +#: ../src/dialog.c:1360 msgid "Supported image formats: " msgstr "Formati di immagine supportati: " -#: ../src/dialog.c:1322 +#: ../src/dialog.c:1367 msgid "" "\n" -"Additional Support For: " +"Additional support for: " msgstr "" "\n" "Supporto aggiuntivo per: " -#: ../src/dialog.c:1341 -msgid "Sound" -msgstr "Suoni" - -#: ../src/dialog.c:1348 +#: ../src/dialog.c:1384 msgid " and " msgstr " e " -#: ../src/dialog.c:1377 +#: ../src/dialog.c:1394 +msgid "" +"\n" +"Sound disabled" +msgstr "\nAudio disabilitato" + +#: ../src/dialog.c:1396 +msgid "" +"\n" +"Sound enabled" +msgstr "\nAudio abilitato" + +#: ../src/dialog.c:1401 +msgid ", VirtualDesktop enabled" +msgstr ", VirtualDesktop abilitato" + +#: ../src/dialog.c:1403 +msgid ", VirtualDesktop disabled" +msgstr ", VirtualDesktop disabilitato" + +#: ../src/dialog.c:1407 +msgid "\n" +msgstr "\n" + +#: ../src/dialog.c:1409 +msgid "Solaris " +msgstr "Solaris " + +#: ../src/dialog.c:1411 +msgid "Xinerama: " +msgstr "Xinerama: " + +#: ../src/dialog.c:1445 msgid "Info" msgstr "Informazioni" -#: ../src/dialog.c:1400 -msgid "Merry X'mas!" +#: ../src/dialog.c:1469 +msgid "Merry Christmas!" msgstr "Buon Natale!" -#: ../src/dialog.c:1470 +#: ../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 "" -" Window Maker è software libero; può essere ridistribuito e/o " -"modificato nei termini della GNU General Public License come pubblicata " -"dalla Free Software Foundation; versione 2 della licenza o (a vostra " -"discrezione) qualsiasi versione successiva.\n" -"\n" +" Window Maker è software libero; può essere ridistribuito e/o modificato\n" +"nei termini della GNU General Public License come pubblicata dalla Free\n" +"Software Foundation; versione 2 della licenza o (a vostra scelta)\n" +"qualsiasi versione successiva.\n" "\n" -" WindowMaker è distribuito nella speranza che sia utile, ma SENZA " -"NESSUNA GARANZIA; neppure l'implicita garanzia di COMMERCIABILITÀ o " -"IDONEITÀ AD UN PARTICOLARE SCOPO. Per maggiori informazioni, vedere " -"la GNU General Public License.\n" +" WindowMaker è distribuito nella speranza che sia utile, ma SENZA\n" +"NESSUNA GARANZIA; neppure l'implicita garanzia di COMMERCIABILITÀ o\n" +"IDONEITÀ AD UN SCOPO PARTICOLARE. Per maggiori informazioni, vedere la\n" +"GNU General Public License.\n" "\n" -"\n" -" Dovreste aver ricevuto una copia della GNU General Public License " -"insieme a questo programma; se non è così, scrivete alla Free Software " +" Dovreste aver ricevuto una copia della GNU General Public License\n" +"insieme a questo programma; se non è così, scrivete alla Free Software\n" "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA." -#: ../src/dialog.c:1491 +#: ../src/dialog.c:1563 msgid "Legal" msgstr "Condizioni legali" -#: ../src/dialog.c:1642 ../src/startup.c:388 +#: ../src/dialog.c:1719 msgid "cannot open connection for crashing dialog panel. Aborting." -msgstr "" -"Impossibile aprire una connessione per la finestra di crash. Abbandono." +msgstr "impossibile aprire una connessione per la finestra di crash. Interrotto." -#: ../src/dialog.c:1668 +#: ../src/dialog.c:1745 msgid "Fatal error" msgstr "Errore fatale" -#: ../src/dialog.c:1679 +#: ../src/dialog.c:1756 #, c-format msgid "" "Window Maker received signal %i\n" @@ -456,12 +520,12 @@ "Window Maker ha ricevuto il segnale %i\n" "(%s)." -#: ../src/dialog.c:1682 +#: ../src/dialog.c:1759 #, c-format msgid "Window Maker received signal %i." msgstr "Window Maker ha ricevuto il segnale %i." -#: ../src/dialog.c:1691 +#: ../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." @@ -469,27 +533,27 @@ " Questo errore fatale è probabilmente dovuto ad un bug. Si prega di " "compilare il file BUGFORM allegato e inviarlo a bugs@windowmaker.org." -#: ../src/dialog.c:1700 +#: ../src/dialog.c:1777 msgid "What do you want to do now?" msgstr "Che cosa si vuole fare adesso?" -#: ../src/dialog.c:1706 +#: ../src/dialog.c:1783 msgid "Select action" msgstr "Selezione dell'azione" -#: ../src/dialog.c:1707 +#: ../src/dialog.c:1784 msgid "Abort and leave a core file" msgstr "Abbandona e genera un core dump" -#: ../src/dialog.c:1708 +#: ../src/dialog.c:1785 msgid "Restart Window Maker" msgstr "Riavvia Window Maker" -#: ../src/dialog.c:1709 +#: ../src/dialog.c:1786 msgid "Start alternate window manager" msgstr "Avvia un altro gestore di finestre" -#: ../src/dialog.c:1887 +#: ../src/dialog.c:1964 msgid "" "Window Maker is part of the GNUstep project.\n" "The GNUstep project aims to create a free\n" @@ -511,797 +575,768 @@ "desktop al di sopra del framework. Per maggiori\n" "informazioni, visitate: www.gnustep.org" -#: ../src/dialog.c:1907 +#: ../src/dialog.c:1987 msgid "About GNUstep" msgstr "Informazioni su GNUStep" -#: ../src/dock.c:213 +#: ../src/dock.c:193 #, c-format msgid "Type the name for workspace %i:" msgstr "Scrivere il nome dell'area di lavoro %i:" -#: ../src/dock.c:214 ../src/dock.c:1103 ../src/dock.c:1106 ../src/dock.c:3327 +#: ../src/dock.c:194 ../src/dock.c:1132 ../src/dock.c:1135 ../src/dock.c:3419 msgid "Rename Workspace" msgstr "Rinomina area di lavoro" -#: ../src/dock.c:487 ../src/dock.c:495 +#: ../src/dock.c:509 ../src/dock.c:517 msgid "Warning" msgstr "Attenzione" -#: ../src/dock.c:488 +#: ../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 "" -"Alcune icone non possono essere rese onnipresenti. Assicurarsi che non ci " -"siano altre icone nella stessa posizione in altre aree di lavoro e che la " -"Clip non sia piena in qualche area di lavoro." +msgstr "Alcune icone non possono essere rese onnipresenti. Assicurarsi che non ci siano altre icone nella stessa posizione in altre aree di lavoro e che la clip non sia piena in qualche area di lavoro." -#: ../src/dock.c:496 +#: ../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 "" -"L'icona non può essere resa onnipresente. Assicurarsi che non ci siano altre " -"icone nella stessa posizione in altre aree di lavoro e che la Clip non sia " -"piena in qualche area di lavoro." +msgstr "L'icona non può essere resa onnipresente. Assicurarsi che non ci siano altre icone nella stessa posizione in altre aree di lavoro e che la clip non sia piena in qualche area di lavoro." -#: ../src/dock.c:523 +#: ../src/dock.c:545 msgid "Workspace Clip" msgstr "Clip dell'area di lavoro" -#: ../src/dock.c:524 +#: ../src/dock.c:546 msgid "All selected icons will be removed!" -msgstr "Tutte le icone selezionate saranno eliminate!" +msgstr "Tutte le icone selezionate saranno eliminate" -#: ../src/dock.c:575 ../src/dock.c:1118 ../src/dock.c:1120 ../src/dock.c:3363 +#: ../src/dock.c:598 ../src/dock.c:1147 ../src/dock.c:1149 ../src/dock.c:3455 msgid "Keep Icon" msgstr "Trattieni l'icona" -#: ../src/dock.c:576 ../src/dock.c:2083 ../src/dock.c:2217 +#: ../src/dock.c:599 ../src/dock.c:2139 ../src/dock.c:2276 msgid "Type the command used to launch the application" msgstr "Scrivi il comando da usare per avviare l'applicazione" -#: ../src/dock.c:927 +#: ../src/dock.c:954 #, c-format msgid "could not launch application %s\n" -msgstr "Impossibile avviare l'applicazione %s\n" +msgstr "impossibile avviare l'applicazione %s\n" -#: ../src/dock.c:982 +#: ../src/dock.c:1010 msgid "could not create workspace submenu for Clip menu" -msgstr "Impossibile creare il sottomenu aree di lavoro per il menù della Clip" +msgstr "impossibile creare il sottomenù aree di lavoro per il menù della clip" -#: ../src/dock.c:1040 +#: ../src/dock.c:1069 msgid "could not create options submenu for Clip menu" -msgstr "Impossibile creare il sottomenu Opzioni per il menù della Clip" +msgstr "impossibile creare il sottomenù Opzioni per il menù della clip" -#: ../src/dock.c:1044 ../src/dock.c:1092 +#: ../src/dock.c:1073 ../src/dock.c:1121 msgid "Keep on Top" msgstr "In primo piano" -#: ../src/dock.c:1050 +#: ../src/dock.c:1079 msgid "Collapsed" msgstr "Collassata" -#: ../src/dock.c:1056 +#: ../src/dock.c:1085 msgid "Autocollapse" msgstr "Collassa automatico" -#: ../src/dock.c:1062 +#: ../src/dock.c:1091 msgid "Autoraise" msgstr "Alza automaticamente" -#: ../src/dock.c:1068 +#: ../src/dock.c:1097 msgid "Autoattract Icons" msgstr "Attrai le icone automatico" -#: ../src/dock.c:1098 +#: ../src/dock.c:1127 msgid "Clip Options" -msgstr "Opzioni della Clip" +msgstr "Opzioni della clip" -#: ../src/dock.c:1108 +#: ../src/dock.c:1137 msgid "Selected" msgstr "Selezionata" -#: ../src/dock.c:1113 ../src/dock.c:1116 ../src/dock.c:3354 +#: ../src/dock.c:1142 ../src/dock.c:1145 ../src/dock.c:3446 msgid "Select All Icons" msgstr "Seleziona tutte" -#: ../src/dock.c:1122 ../src/dock.c:1124 ../src/dock.c:3371 +#: ../src/dock.c:1151 ../src/dock.c:1153 ../src/dock.c:3463 msgid "Move Icon To" msgstr "Sposta l'icona in" -#: ../src/dock.c:1129 ../src/dock.c:1132 ../src/dock.c:3382 +#: ../src/dock.c:1158 ../src/dock.c:1161 ../src/dock.c:3474 msgid "Remove Icon" msgstr "Elimina l'icona" -#: ../src/dock.c:1134 +#: ../src/dock.c:1163 msgid "Attract Icons" msgstr "Attrai le icone" -#: ../src/dock.c:1137 +#: ../src/dock.c:1166 msgid "Launch" msgstr "Avvia" -#: ../src/dock.c:1145 +#: ../src/dock.c:1174 msgid "Settings..." msgstr "Proprietà..." -#: ../src/dock.c:1504 ../src/dock.c:1607 +#: ../src/dock.c:1538 ../src/dock.c:1645 #, c-format msgid "bad value in docked icon state info %s" -msgstr "Valore errato nelle informazioni di stato dell'icona nel Dock %s" +msgstr "valore errato nelle informazioni di stato dell'icona nel dock %s" -#: ../src/dock.c:1615 +#: ../src/dock.c:1653 #, c-format msgid "bad value in docked icon position %i,%i" -msgstr "Valore errato nella posizione dell'icona nel Dock %i,%i" +msgstr "valore errato nella posizione dell'icona nel dock %i,%i" -#: ../src/dock.c:1867 +#: ../src/dock.c:1673 +#, c-format +msgid "bad value in dock state info:%s" +msgstr "valore errato nelle informazioni di stato del dock: %s" + +# FIXME +#: ../src/dock.c:1923 msgid "there are too many icons stored in dock. Ignoring what doesn't fit" -msgstr "Ci sono troppe icone nel Dock. Ignoro quelle che non ci entrano" +msgstr "ci sono troppe icone nel dock. Ignorate quelle che non ci entrano" #. icon->forced_dock = 1; -#: ../src/dock.c:2082 ../src/dock.c:2216 +#: ../src/dock.c:2138 ../src/dock.c:2275 msgid "Dock Icon" -msgstr "Icona del Dock" +msgstr "Icona del dock" -#: ../src/dock.c:3236 ../src/dock.c:3240 +#: ../src/dock.c:3333 #, c-format msgid "Could not execute command \"%s\"" msgstr "Impossibile eseguire il comando \"%s\"" -#: ../src/dock.c:3333 +#: ../src/dock.c:3425 msgid "Toggle Omnipresent" msgstr "Inverti Onnipresente" -#: ../src/dock.c:3338 ../src/winmenu.c:415 ../src/winspector.c:1391 +#: ../src/dock.c:3430 ../src/winmenu.c:414 ../src/winspector.c:1383 msgid "Omnipresent" msgstr "Onnipresente" -#: ../src/dock.c:3352 +#: ../src/dock.c:3444 msgid "Unselect All Icons" msgstr "Deseleziona tutte" -#: ../src/dock.c:3361 +#: ../src/dock.c:3453 msgid "Keep Icons" msgstr "Trattieni le icone" -#: ../src/dock.c:3369 +#: ../src/dock.c:3461 msgid "Move Icons To" msgstr "Sposta le icone in" -#: ../src/dock.c:3380 +#: ../src/dock.c:3472 msgid "Remove Icons" msgstr "Elimina selezionate" -#: ../src/dock.c:3411 +#: ../src/dock.c:3503 msgid "Bring Here" msgstr "Porta qui" -#: ../src/dockedapp.c:131 +#: ../src/dockedapp.c:150 #, c-format msgid "could not find icon %s, used in a docked application" -msgstr "Impossibile trovare l'icona %s, usata in una applicazione nel Dock" +msgstr "impossibile trovare l'icona %s, usata in una applicazione nel dock" -#: ../src/dockedapp.c:210 +#: ../src/dockedapp.c:230 #, c-format msgid "Could not open specified icon file: %s" msgstr "Impossibile aprire il file dell'icona: %s" -#: ../src/dockedapp.c:212 +#: ../src/dockedapp.c:232 msgid "Ignore" msgstr "Ignora" -#: ../src/dockedapp.c:305 +#: ../src/dockedapp.c:334 msgid "Start when Window Maker is started" msgstr "Esecuzione automatica all'avvio" -#: ../src/dockedapp.c:312 +#: ../src/dockedapp.c:341 msgid "Lock (prevent accidental removal)" msgstr "Blocca (evita l'eliminazione accidentale)" -#: ../src/dockedapp.c:318 +#: ../src/dockedapp.c:345 msgid "Application path and arguments" msgstr "Percorso dell'applicazione e argomenti" -#: ../src/dockedapp.c:329 +#: ../src/dockedapp.c:358 +msgid "Command for middle-click launch" +msgstr "" + +#: ../src/dockedapp.c:372 +#, c-format +msgid "%s will be replaced with current selection" +msgstr "%s sarà sostituito dalla selezione corrente" + +#: ../src/dockedapp.c:377 msgid "Command for files dropped with DND" msgstr "Comando per i file ricevuti tramite DnD" -#: ../src/dockedapp.c:341 +#: ../src/dockedapp.c:391 #, c-format msgid "%d will be replaced with the file name" msgstr "%d sarà sostituito col nome del file" -#: ../src/dockedapp.c:345 +#: ../src/dockedapp.c:395 msgid "DND support was not compiled in" msgstr "Il supporto DnD non è stato compilato" -#: ../src/dockedapp.c:351 +#: ../src/dockedapp.c:400 msgid "Icon Image" msgstr "Icona" -#: ../src/dockedapp.c:363 ../src/winspector.c:1529 +#: ../src/dockedapp.c:414 ../src/winspector.c:1521 msgid "Browse..." msgstr "Sfoglia..." -#: ../src/dockedapp.c:408 +#: ../src/dockedapp.c:475 msgid "Docked Application Settings" -msgstr "Proprietà dell'applicazione nel Dock" +msgstr "Impostazioni dell'applicazione nel dock" -#: ../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 "Impossibile generare la trama: %s" +msgstr "impossibile generare la trama: %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 "Errore nella generazione dell'immagine: %s" +msgstr "errore nella generazione dell'immagine: %s" -#: ../src/framewin.c:777 +#: ../src/framewin.c:775 #, c-format msgid "error rendering image: %s" -msgstr "Errore nella generazione dell'immagine: %s" +msgstr "errore nella generazione dell'immagine: %s" -#: ../src/icon.c:229 ../src/wdefaults.c:440 +#: ../src/icon.c:239 ../src/wdefaults.c:443 #, c-format msgid "error loading image file \"%s\"" -msgstr "Errore nel caricamento del file \"%s\"" +msgstr "errore nel caricamento del file \"%s\"" -#: ../src/icon.c:488 ../src/icon.c:497 +#: ../src/icon.c:503 ../src/icon.c:512 #, c-format msgid "could not create directory %s" -msgstr "Impossibile creare la directory %s" +msgstr "impossibile creare la directory %s" -#: ../src/icon.c:764 +#: ../src/icon.c:782 #, c-format msgid "could not find default icon \"%s\"" -msgstr "Impossibile trovare l'icona predefinita \"%s\"" +msgstr "impossibile trovare l'icona predefinita \"%s\"" -#: ../src/icon.c:770 +#: ../src/icon.c:788 #, c-format msgid "could not load default icon \"%s\":%s" -msgstr "Impossibile caricare l'icona predefinita \"%s\":%s" +msgstr "impossibile caricare l'icona predefinita \"%s\":%s" -#: ../src/main.c:205 +#: ../src/main.c:220 msgid "failed to restart Window Maker." -msgstr "Riavvio di Window Maker fallito." +msgstr "riavvio di Window Maker non riuscito." -#: ../src/main.c:208 +#: ../src/main.c:223 #, c-format msgid "could not exec %s" -msgstr "Impossibile eseguire %s" +msgstr "impossibile eseguire %s" -#: ../src/main.c:253 +#: ../src/main.c:269 msgid "Could not execute command: " msgstr "Impossibile eseguire il comando: " -#: ../src/main.c:410 +#: ../src/main.c:426 #, c-format msgid "%s aborted.\n" -msgstr "%s abbandonato.\n" +msgstr "%s interrotto.\n" -#: ../src/main.c:421 +#: ../src/main.c:437 #, c-format msgid "Usage: %s [options]\n" msgstr "Uso: %s [opzioni]\n" -#: ../src/main.c:422 +#: ../src/main.c:438 msgid "The Window Maker window manager for the X window system" -msgstr "Window Maker: il gestore di finestre per il sistema X Window" +msgstr "Il gestore di finestre Window Maker per il sistema X Window" -#: ../src/main.c:424 +#: ../src/main.c:440 msgid " -display host:dpy\tdisplay to use" -msgstr " -display host:disp\tDisplay da usare" +msgstr " -display host:disp\tdisplay da usare" -#: ../src/main.c:426 +#: ../src/main.c:442 msgid " --no-cpp \t\tdisable preprocessing of configuration files" -msgstr " --no-cpp \t\tDisabilita la preelaborazione dei file di configurazione" +msgstr " --no-cpp \t\tdisabilita la preanalisi dei file di configurazione" -#: ../src/main.c:428 +#: ../src/main.c:444 msgid " --no-dock\t\tdo not open the application Dock" -msgstr " --no-dock\t\tNon avviare il Dock per le applicazioni" +msgstr " --no-dock\t\tnon avvia il dock per le applicazioni" -#: ../src/main.c:429 +#: ../src/main.c:445 msgid " --no-clip\t\tdo not open the workspace Clip" -msgstr " --no-clip\t\tNon avviare la Clip delle aree di lavoro" +msgstr " --no-clip\t\tnon avvia la clip delle aree di lavoro" -#: ../src/main.c:430 +#: ../src/main.c:446 msgid " --no-autolaunch\tdo not autolaunch applications" -msgstr " --no-autolaunch\tnon avviare automaticamente le applicazioni" +msgstr " --no-autolaunch\tnon avvia automaticamente le applicazioni" -#: ../src/main.c:431 +#: ../src/main.c:447 msgid " --dont-restore\t\tdo not restore saved session" -msgstr " --dont-restore\t\tnon ripristinare la sessione salvata" +msgstr " --dont-restore\t\tnon ripristina la sessione salvata" -#: ../src/main.c:433 +#: ../src/main.c:449 msgid " --locale locale\tlocale to use" msgstr " --locale locale\tlocalizzazione da usare" -#: ../src/main.c:435 +#: ../src/main.c:451 msgid "" " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals" msgstr "" -" --create-stdcmap\tCrea l'hint della colormap standard nelle visual PseudoColor" +" --create-stdcmap\tcrea l'hint standard della colormap nelle visual\n" +" PseudoColor" -#: ../src/main.c:436 +#: ../src/main.c:452 msgid " --visual-id visualid\tvisual id of visual to use" msgstr " --visual-id visualid\tID della visuale da usare" -#: ../src/main.c:437 +#: ../src/main.c:453 msgid " --static\t\tdo not update or save configurations" -msgstr " --static\t\tNon aggiornare o salvare la configurazione" +msgstr " --static\t\tnon aggiorna e non salva la configurazione" -#: ../src/main.c:438 +#: ../src/main.c:454 msgid " --no-polling\t\tdo not periodically check for configuration updates" -msgstr " --no-polling\t\tNon controllare periodicamente le modifiche " -"alla configurazione" +msgstr "" +" --no-polling\t\tnon controlla periodicamente le modifiche alla\n" +" configurazione" -#: ../src/main.c:440 +#: ../src/main.c:456 msgid " --synchronous\t\tturn on synchronous display mode" -msgstr " --synchronous\t\tAttiva la modalità sincrona del display" +msgstr " --synchronous\t\tattiva la modalità sincrona del display" -#: ../src/main.c:442 +#: ../src/main.c:458 msgid " --version\t\tprint version and exit" -msgstr " --version\t\tVisualizza la versione ed esci" +msgstr " --version\t\tstampa la versione ed esce" -#: ../src/main.c:443 +#: ../src/main.c:459 msgid " --help\t\t\tshow this message" -msgstr " --help\t\t\tMostra questo messaggio" +msgstr " --help\t\t\tmostra questo messaggio" -#: ../src/main.c:455 +#: ../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 "" -"Impossibile trovare la directory GNUstep dell'utente (%s).\n" -"Assicurarsi di aver installato correttamente Window Maker e di aver eseguito " +"impossibile trovare la directory GNUstep dell'utente (%s).\n" +"Assicurarsi di aver installato correttamente Window Maker e di aver eseguito\n" +"wmaker.inst" + +#: ../src/main.c:478 +#, c-format +msgid "could not find user GNUstep directory (%s)." +msgstr "impossibile trovare la directory GNUstep dell'utente (%s)" + +#: ../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 "" +"Si è verificato un errore durante la creazione della directory GNUsterp, \n" +"assicurarsi di aver installato correttamente Window Maker e di aver eseguito\n" "wmaker.inst" -#: ../src/main.c:476 ../src/main.c:481 +#: ../src/main.c:484 +#, c-format +msgid "%s directory created with default configuration." +msgstr "directory %s creata con la configurazione predefinita." + +# FIXME UPSTREAM +#: ../src/main.c:506 ../src/main.c:511 #, c-format msgid "%s:could not execute initialization script" msgstr "%s: impossibile eseguire lo script di inizializzazione" -#: ../src/main.c:501 ../src/main.c:506 +# FIXME UPSTREAM +#: ../src/main.c:533 ../src/main.c:538 #, c-format msgid "%s:could not execute exit script" msgstr "%s: impossibile eseguire lo script di uscita" -#: ../src/main.c:622 ../src/main.c:630 ../src/main.c:638 ../src/main.c:658 +#: ../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 "Mancano parametri per %s" +msgstr "argomenti mancanti per %s" -#: ../src/main.c:642 +#: ../src/main.c:742 #, c-format msgid "bad value for visualid: \"%s\"" -msgstr "Valore errato per l'ID di visuale: \"%s\"" +msgstr "valore errato per l'ID di visuale: \"%s\"" -#: ../src/main.c:666 +#: ../src/main.c:766 #, c-format msgid "%s: invalid argument '%s'\n" -msgstr "%s: parametro non valido '%s'\n" +msgstr "%s: argomento non valido '%s'\n" -#: ../src/main.c:667 +#: ../src/main.c:767 #, c-format msgid "Try '%s --help' for more information\n" -msgstr "Prova '%s --help' per maggiori informazioni\n" +msgstr "Provare '%s --help' per maggiori informazioni\n" -#: ../src/main.c:698 +#: ../src/main.c:802 msgid "X server does not support locale" msgstr "Il server X non supporta la localizzazione" -#: ../src/main.c:702 +#: ../src/main.c:806 msgid "cannot set locale modifiers" -msgstr "Impossibile impostare i modificatori della localizzazione" +msgstr "impossibile impostare i modificatori della localizzazione" -#: ../src/main.c:718 +#: ../src/main.c:822 #, c-format msgid "could not open display \"%s\"" -msgstr "Impossibile aprire il display \"%s\"" +msgstr "impossibile aprire il display \"%s\"" -#: ../src/menu.c:1255 +#: ../src/menu.c:1273 msgid "could not grab keyboard" -msgstr "Impossibile catturare la tastiera" +msgstr "impossibile catturare la tastiera" + +# FIXME UPSTREAM REPORTED +#: ../src/menu.c:2612 +#, c-format +msgid "bad value in menus state info:%s" +msgstr "valore errato nelle informazioni di stato dei menu: %s" -#: ../src/misc.c:71 +#: ../src/misc.c:65 #, c-format msgid "could not define value for %s for cpp" -msgstr "Impossibile definire un valore per %s per cpp" +msgstr "impossibile definire un valore per %s per cpp" -#: ../src/misc.c:101 +#: ../src/misc.c:95 #, c-format msgid "could not get password entry for UID %i" -msgstr "Impossibile trovare la password per l'UID %i" +msgstr "impossibile trovare la password per l'UID %i" -#: ../src/misc.c:126 +#: ../src/misc.c:120 #, c-format msgid "your machine is misconfigured. HOSTNAME is set to %s" -msgstr "La macchina è mal configurata. HOSTNAME è impostato a %s" +msgstr "la macchina è mal configurata. HOSTNAME è impostato a %s" -#: ../src/misc.c:132 +#: ../src/misc.c:126 #, c-format msgid "your machine is misconfigured. HOST is set to %s" -msgstr "La macchina è mal configurata. HOST è impostato a %s" +msgstr "la macchina è mal configurata. HOST è impostato a %s" -#: ../src/misc.c:626 +#: ../src/misc.c:621 msgid "Program Arguments" -msgstr "Parametri del programma" +msgstr "Argomenti del programma" -#: ../src/misc.c:627 +#: ../src/misc.c:622 msgid "Enter command arguments:" msgstr "Scrivere gli argomenti del comando:" -#: ../src/misc.c:720 -msgid "unable to get dropped data from DND drop" -msgstr "Impossibile leggere i dati rilasciati dal DnD" - -#: ../src/misc.c:728 -msgid "error getting dropped data from DND drop" -msgstr "Errore leggendo i dati rilasciati dal DnD" - -#: ../src/misc.c:734 -msgid "out of memory while getting data from DND drop" -msgstr "Memoria esaurita leggendo i dati rilasciati dal DnD" - -#: ../src/misc.c:779 ../src/misc.c:919 +#: ../src/misc.c:736 ../src/misc.c:874 #, c-format msgid "out of memory during expansion of \"%s\"" -msgstr "Memoria esaurita durante l'espansione di \"%s\"" +msgstr "memoria esaurita durante l'espansione di \"%s\"" -#: ../src/misc.c:833 +#: ../src/misc.c:790 msgid "out of memory during expansion of \"%w\"" -msgstr "Memoria esaurita durante l'espansione di \"%w\"" +msgstr "memoria esaurita durante l'espansione di \"%w\"" -#: ../src/misc.c:851 +#: ../src/misc.c:808 msgid "out of memory during expansion of \"%W\"" -msgstr "Memoria esaurita durante l'espansione di \"%W\"" +msgstr "memoria esaurita durante l'espansione di \"%W\"" -#: ../src/misc.c:867 +#: ../src/misc.c:824 +#, c-format msgid "out of memory during expansion of \"%a\"" -msgstr "Memoria esaurita durante l'espansione di \"%a\"" +msgstr "memoria esaurita durante l'espansione di \"%a\"" -#: ../src/misc.c:898 +#: ../src/misc.c:853 #, c-format msgid "out of memory during expansion of \"%d\"" -msgstr "Memoria esaurita durante l'espansione di \"%d\"" +msgstr "memoria esaurita durante l'espansione di \"%d\"" -#: ../src/misc.c:912 +#: ../src/misc.c:867 msgid "selection not available" -msgstr "Selezione non disponibile" +msgstr "selezione non disponibile" -#: ../src/misc.c:985 ../src/misc.c:991 +#: ../src/misc.c:911 ../src/misc.c:917 #, c-format msgid "bad window name value in %s state info" -msgstr "Nome della finestra errato nelle informazioni di stato di %s" +msgstr "nome della finestra errato nelle informazioni di stato di %s" -#: ../src/misc.c:1247 +#: ../src/misc.c:1156 msgid "could not send message to background image helper" -msgstr "Impossibile inviare il messaggio al gestore dello sfondo" +msgstr "impossibile inviare il messaggio al gestore dello sfondo" #: ../src/pixmap.c:235 #, c-format msgid "could not load mask bitmap file \"%s\". Won't use mask" -msgstr "Impossibile caricare la maschera dal file bitmap \"%s\". Faccio senza" - -#: ../src/proplist.c:180 -msgid "unterminated string" -msgstr "Stringa non terminata" - -#: ../src/proplist.c:247 -msgid "unterminated array" -msgstr "Array non terminato" - -#: ../src/proplist.c:256 -msgid "missing , in array or unterminated array" -msgstr "Manca `,' nell'array o array non terminato" - -#: ../src/proplist.c:267 -msgid "could not get array element" -msgstr "Impossibile leggere l'elemento dell'array" - -#: ../src/proplist.c:297 -msgid "unterminated dictionary" -msgstr "Dizionario non terminato" - -#: ../src/proplist.c:315 -msgid "missing dictionary key" -msgstr "Chiave del dizionario mancante" - -#: ../src/proplist.c:317 -msgid "missing dictionary entry key or unterminated dictionary" -msgstr "Elemento del dizionario mancante o dizionario non terminato" - -#: ../src/proplist.c:323 -msgid "error parsing dictionary key" -msgstr "Errore analizzando la chiave del dizionario" - -#: ../src/proplist.c:332 -msgid "missing = in dictionary entry" -msgstr "Manca `=' nell'elemento del dizionario" - -#: ../src/proplist.c:351 -msgid "missing ; in dictionary entry" -msgstr "Manca `;' nell'elemento del dizionario" - -#: ../src/proplist.c:432 -msgid "" -"was expecting a string, dictionary, data or array. If it's a string, try " -"enclosing it with \"." -msgstr "" -"Mi aspettavo una stringa, un dizionario, dati o un array. Se è una stringa, " -"prova a racchiuderla con `\"'." - -#: ../src/proplist.c:434 -msgid "Comments are not allowed inside WindowMaker owned domain files." -msgstr "I commenti non sono permessi nei file di dominio di WindowMaker." - -#: ../src/proplist.c:453 -#, c-format -msgid "could not open domain file %s" -msgstr "Impossibile aprire il file di dominio %s" - -#: ../src/proplist.c:466 -msgid "extra data after end of file" -msgstr "Dati eccedenti dopo la fine del file" +msgstr "impossibile caricare la maschera dal file bitmap \"%s\". Non verrà usata" #: ../src/resources.c:44 #, c-format msgid "could not parse color \"%s\"" -msgstr "Impossibile analizzare il colore \"%s\"" +msgstr "impossibile analizzare il colore \"%s\"" #: ../src/resources.c:48 #, c-format msgid "could not allocate color \"%s\"" -msgstr "Impossibile allocare il colore \"%s\"" +msgstr "impossibile allocare il colore \"%s\"" -#: ../src/rootmenu.c:183 ../src/rootmenu.c:185 +#: ../src/rootmenu.c:196 ../src/rootmenu.c:198 msgid "Exit" msgstr "Uscita" -#: ../src/rootmenu.c:184 +#: ../src/rootmenu.c:197 msgid "Exit window manager?" -msgstr "Esco da Window Maker?" +msgstr "Uscire da Window Maker?" -#: ../src/rootmenu.c:220 +#: ../src/rootmenu.c:245 msgid "Close X session" msgstr "Chiudi la sessione X" -#: ../src/rootmenu.c:221 +#: ../src/rootmenu.c:246 msgid "" "Close Window System session?\n" "Kill might close applications with unsaved data." msgstr "" -"Chiudo la sessione del Window System?\n" +"Chiudere la sessione del Window System?\n" "Il comando potrebbe chiudere applicazioni con dati non salvati." #. #. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); #. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); #. -#: ../src/rootmenu.c:223 ../src/winmenu.c:503 +#: ../src/rootmenu.c:248 ../src/winmenu.c:501 msgid "Close" msgstr "Chiudi" -#: ../src/rootmenu.c:234 +#: ../src/rootmenu.c:261 msgid "Kill X session" -msgstr "Uccidi la sessione X" +msgstr "Termina la sessione X" -#: ../src/rootmenu.c:235 +#: ../src/rootmenu.c:262 msgid "" "Kill Window System session?\n" "(all applications will be closed)" msgstr "" -"Uccido la sessione del Window System?\n" +"Terminare la sessione del Window System?\n" "(Tutte le applicazioni saranno chiuse)" -#: ../src/rootmenu.c:502 +#: ../src/rootmenu.c:544 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" msgstr "%s: definizione di scorciatoia non valida \"%s\" per l'elemento %s" -#: ../src/rootmenu.c:510 +#: ../src/rootmenu.c:552 #, c-format msgid "%s:invalid key in shortcut \"%s\" for entry %s" msgstr "%s: tasto non valido nella scorciatoia \"%s\" per l'elemento %s" -#: ../src/rootmenu.c:563 +#: ../src/rootmenu.c:605 #, c-format msgid "%s: unmatched '\"' in menu file" -msgstr "%s: `\"' mancante nel file di menù" +msgstr "%s: virgolette \" non corrisposte nel file di menù" -#: ../src/rootmenu.c:613 +#: ../src/rootmenu.c:655 #, c-format msgid "%s: missing command" msgstr "%s: comando mancante" -#: ../src/rootmenu.c:645 +#: ../src/rootmenu.c:687 #, c-format msgid "invalid OPEN_MENU specification: %s" -msgstr "Definizione OPEN_MENU non valida: %s" +msgstr "specificazione OPEN_MENU non valida: %s" -#: ../src/rootmenu.c:693 +#: ../src/rootmenu.c:738 #, c-format msgid "%s:could not stat menu" msgstr "%s: impossibile aprire il menù" -#: ../src/rootmenu.c:701 +#: ../src/rootmenu.c:746 #, c-format msgid "%s:could not stat menu:%s" msgstr "%s: impossibile aprire il menù: %s" -#: ../src/rootmenu.c:719 +#: ../src/rootmenu.c:764 #, c-format msgid "too many parameters in OPEN_MENU: %s" -msgstr "Troppi parametri in OPEN_MENU: %s" +msgstr "troppi parametri in OPEN_MENU: %s" -#: ../src/rootmenu.c:755 +#: ../src/rootmenu.c:808 msgid "" "There are more than one WORKSPACE_MENU commands in the applications menu. " "Only one is allowed." -msgstr "" -"C'è più di un comando WORKSPACE_MENU nel menù delle applicazioni. Ne è " -"permesso uno solo." +msgstr "C'è più di un comando WORKSPACE_MENU nel menù delle applicazioni. Ne è permesso uno solo." -#: ../src/rootmenu.c:778 +#: ../src/rootmenu.c:842 msgid "" "There are more than one WINDOWS_MENU commands in the applications menu. Only " "one is allowed." -msgstr "" -"C'è più di un comando WINDOWS_MENU nel menù delle applicazioni. Uno solo è " -"permesso." +msgstr "C'è più di un comando WINDOWS_MENU nel menù delle applicazioni. Ne è permesso uno solo." -#: ../src/rootmenu.c:783 +#: ../src/rootmenu.c:847 msgid "Window List" -msgstr "Lista delle finestre" +msgstr "Elenco delle finestre" -#: ../src/rootmenu.c:810 ../src/rootmenu.c:828 ../src/rootmenu.c:838 +#: ../src/rootmenu.c:876 ../src/rootmenu.c:894 ../src/rootmenu.c:904 #, c-format msgid "%s:missing parameter for menu command \"%s\"" msgstr "%s: manca un parametro per il comando di menù \"%s\"" -#: ../src/rootmenu.c:906 +#: ../src/rootmenu.c:972 #, c-format msgid "%s:unknown command \"%s\" in menu config." msgstr "%s: comando sconosciuto \"%s\" nella definizione di menù." -#: ../src/rootmenu.c:914 +# FIXME UPSTREAM +#: ../src/rootmenu.c:980 #, c-format msgid "%s:can't add shortcut for entry \"%s\"" -msgstr "%s: Impossibile assegnare una scorciatoia all'elemento \"%s\"" +msgstr "%s: impossibile assegnare una scorciatoia all'elemento \"%s\"" -#: ../src/rootmenu.c:1051 +# FIXME UPSTREAM +#: ../src/rootmenu.c:1117 #, c-format msgid "%s:maximal line size exceeded in menu config: %s" msgstr "%s: linea troppo lunga nella definizione di menù: %s" -#: ../src/rootmenu.c:1073 ../src/rootmenu.c:1165 ../src/rootmenu.c:1266 +# FIXME UPSTREAM +#: ../src/rootmenu.c:1139 ../src/rootmenu.c:1232 ../src/rootmenu.c:1336 #, c-format msgid "%s:missing command in menu config: %s" msgstr "%s: comando mancante nella definizione di menù: %s" -#: ../src/rootmenu.c:1103 +# FIXME UPSTREAM +#: ../src/rootmenu.c:1169 #, c-format msgid "%s:syntax error in menu file:END declaration missing" msgstr "%s: errore di sintassi nel file di menù: manca l'istruzione END" -#: ../src/rootmenu.c:1132 ../src/rootmenu.c:1231 +#: ../src/rootmenu.c:1198 ../src/rootmenu.c:1300 msgid "could not make arguments for menu file preprocessor" -msgstr "Impossibile generare i parametri per il preprocessore del file di menù" +msgstr "impossibile generare gli argomenti per il preprocessore del file di menù" -#: ../src/rootmenu.c:1138 ../src/rootmenu.c:1238 +# FIXME UPSTREAM +#: ../src/rootmenu.c:1205 ../src/rootmenu.c:1308 #, c-format msgid "%s:could not open/preprocess menu file" msgstr "%s: impossibile aprire/preelaborare il file di menù" -#: ../src/rootmenu.c:1150 ../src/rootmenu.c:1251 +# FIXME UPSTREAM< +#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321 #, c-format msgid "%s:could not open menu file" msgstr "%s: impossibile aprire il file di menù" -#: ../src/rootmenu.c:1177 +# FIXME UPSTREAM< +#: ../src/rootmenu.c:1244 #, c-format msgid "%s:invalid menu file. MENU command is missing" msgstr "%s: file di menù non valido: manca il comando MENU" -#: ../src/rootmenu.c:1186 +#: ../src/rootmenu.c:1253 msgid "error reading preprocessed menu data" -msgstr "Errore nella lettura dei dati di menù preelaborati" +msgstr "errore nella lettura dei dati di menù preelaborati" -#: ../src/rootmenu.c:1278 +# FIXME UPSTREAM +#: ../src/rootmenu.c:1348 #, c-format msgid "%s:no title given for the root menu" -msgstr "%s: manca il titolo per il menù principale" +msgstr "%s: nessun titolo fornito per il menù principale" -#: ../src/rootmenu.c:1369 ../src/rootmenu.c:1442 ../src/rootmenu.c:1483 +#: ../src/rootmenu.c:1439 ../src/rootmenu.c:1512 ../src/rootmenu.c:1553 #, c-format msgid "out of memory while constructing directory menu %s" -msgstr "Memoria esaurita costruendo il menù %s" +msgstr "memoria esaurita costruendo il menù %s" -#: ../src/rootmenu.c:1379 +# FIXME UPSTREAM +#: ../src/rootmenu.c:1449 #, c-format msgid "%s:could not stat file \"%s\" in menu directory" msgstr "%s: impossibile identificare il file \"%s\" nella directory del menù" -#: ../src/rootmenu.c:1537 +#: ../src/rootmenu.c:1607 msgid "Commands" msgstr "Comandi" -#: ../src/rootmenu.c:1540 +#: ../src/rootmenu.c:1610 msgid "Restart" msgstr "Riavvia" -#: ../src/rootmenu.c:1541 +#: ../src/rootmenu.c:1611 msgid "Exit..." msgstr "Esci..." -#: ../src/rootmenu.c:1586 +#: ../src/rootmenu.c:1656 #, c-format msgid "could not find menu file \"%s\" referenced in WMRootMenu" -msgstr "Impossibile trovare il file di menù \"%s\" indicato in WMRootMenu" +msgstr "impossibile trovare il file di menù \"%s\" indicato in WMRootMenu" -#: ../src/rootmenu.c:1593 +#: ../src/rootmenu.c:1663 #, c-format msgid "could not access menu \"%s\" referenced in WMRootMenu" -msgstr "Impossibile accedere al file di menù \"%s\" indicato in WMRootMenu" +msgstr "impossibile accedere al file di menù \"%s\" indicato in WMRootMenu" -#: ../src/rootmenu.c:1604 +#: ../src/rootmenu.c:1674 #, c-format msgid "" "using default menu file \"%s\" as the menu referenced in WMRootMenu could " "not be found " -msgstr "" -"Uso il file di menù predefinito \"%s\" perché non trovo il menù indicato in " -"WMRootMenu " +msgstr "viene usato il file di menù predefinito \"%s\" perché non si trova il menù indicato in WMRootMenu " -#: ../src/rootmenu.c:1627 ../src/rootmenu.c:1703 +# FIXME UPSTREAM +#: ../src/rootmenu.c:1697 ../src/rootmenu.c:1773 #, c-format msgid "%s:format error in root menu configuration \"%s\"" msgstr "%s: errore di formato nella configurazione del menù principale \"%s\"" -#: ../src/rootmenu.c:1790 +#: ../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 "" -"Il menù delle applicazioni non può essere caricato. Consultare l'output nella " -"console per una descrizione dettagliata del problema." +"Il menù delle applicazioni non può essere caricato. Consultare l'output " +"nella console per una descrizione dettagliata del problema." -#: ../src/screen.c:740 +#: ../src/screen.c:709 #, c-format msgid "could not initialize graphics library context: %s" -msgstr "Impossibile inizializzare il contesto della libreria grafica: %s" +msgstr "impossibile inizializzare il contesto della libreria grafica: %s" -#: ../src/screen.c:771 -msgid "could not do initialization of WINGs widget set" -msgstr "Impossibile inizializzare la libreria WINGs" +#: ../src/screen.c:737 +msgid "could not initialize WINGs widget set" +msgstr "impossibile inizializzare i widget WINGs" -#: ../src/screen.c:1135 +#: ../src/screen.c:1144 #, c-format msgid "could not save session state in %s" -msgstr "Impossibile salvare lo stato della sessione in %s" +msgstr "impossibile salvare lo stato della sessione in %s" -#: ../src/session.c:183 ../src/wdefaults.c:588 ../src/winspector.c:451 +#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:459 #, c-format msgid "can't convert \"%s\" to boolean" -msgstr "Impossibile convertire \"%s\" in booleano" +msgstr "impossibile convertire \"%s\" in booleano" #: ../src/session.c:1018 msgid "out of memory while saving session state" -msgstr "Memoria esaurita salvando lo stato della sessione" +msgstr "memoria esaurita salvando lo stato della sessione" -#: ../src/session.c:1109 +#: ../src/session.c:1101 msgid "end of memory while saving session state" -msgstr "Memoria esaurita salvando lo stato della sessione" +msgstr "memoria esaurita salvando lo stato della sessione" #. This is not fatal but can mean the session manager exited. #. * If the session manager exited normally we would get a @@ -1309,148 +1344,79 @@ #. * If the sm was the last client of session, then we'll die #. * anyway, otherwise we can continue doing our stuff. #. -#: ../src/session.c:1243 +#: ../src/session.c:1239 msgid "connection to the session manager was lost" -msgstr "Connessione al gestore di sessione perduta." +msgstr "connessione al gestore di sessione perduta." -#: ../src/stacking.c:73 +#: ../src/stacking.c:81 msgid "could not get window list!!" -msgstr "Impossibile trovare la lista delle finestre!!" +msgstr "impossibile trovare l'elenco delle finestre" -#: ../src/startup.c:202 +#: ../src/startup.c:195 #, c-format msgid "internal X error: %s\n" -msgstr "Errore interno di X: %s\n" - -#: ../src/startup.c:260 -#, c-format -msgid "got signal %i (%s) - restarting\n" -msgstr "Ricevuto segnale %i (%s) - riavvio...\n" - -#: ../src/startup.c:262 -#, c-format -msgid "got signal %i - restarting\n" -msgstr "Ricevuto segnale %i - riavvio...\n" - -#: ../src/startup.c:272 -#, c-format -msgid "got signal %i (%s) - rereading defaults\n" -msgstr "Ricevuto segnale %i (%s) - rileggo la configurazione...\n" - -#: ../src/startup.c:274 -#, c-format -msgid "got signal %i - rereading defaults\n" -msgstr "Ricevuto segnale %i - rileggo la configurazione...\n" +msgstr "errore interno di X: %s\n" -#: ../src/startup.c:284 -#, c-format -msgid "got signal %i (%s) - exiting...\n" -msgstr "Ricevuto segnale %i (%s) - esco...\n" - -#: ../src/startup.c:286 -#, c-format -msgid "got signal %i - exiting...\n" -msgstr "Ricevuto segnale %i - esco...\n" - -#: ../src/startup.c:322 -#, c-format -msgid "got signal %i (%s)\n" -msgstr "Ricevuto segnale %i (%s)\n" - -#: ../src/startup.c:324 -#, c-format -msgid "got signal %i\n" -msgstr "Ricevuto segnale %i\n" - -#: ../src/startup.c:335 -msgid "" -"crashed while trying to do some post-crash cleanup. Aborting immediatelly." -msgstr "" -"andato in crash cercando di fare un po' di pulizia dopo un crash. " -"Abbandono immediatamente." - -#. we try to restart Window Maker -#: ../src/startup.c:400 -msgid "trying to restart Window Maker..." -msgstr "Provo a riavviare Window Maker..." - -#: ../src/startup.c:405 -msgid "trying to start alternate window manager..." -msgstr "Provo ad avviare un gestore di finestre alternativo..." - -#: ../src/startup.c:410 -msgid "failed to start alternate window manager. Aborting." -msgstr "Fallito l'avvio di un gestore di finestre alternativo. Abbandono." - -#: ../src/startup.c:412 -msgid "" -"a fatal error has occured, probably due to a bug. Please fill the included " -"BUGFORM and report it." -msgstr "" -"E` avvenuto un errore fatale, probabilmente un bug. Compila il file BUGFORM " -"allegato e notificalo." - -#: ../src/startup.c:889 +#: ../src/startup.c:772 #, c-format msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" -msgstr "" -"La dimensione delle icone è configurata a %i, ma è troppo piccola. Uso 16.\n" +msgstr "la dimensione delle icone è impostata a %i, ma è troppo piccola. Viene usato 16.\n" -#: ../src/startup.c:917 +#: ../src/startup.c:801 msgid "XKB is not supported. KbdModeLock is automatically disabled." msgstr "XKB non è supportato. KbdModeLock è disabilitato automaticamente." -#: ../src/startup.c:936 +#: ../src/startup.c:820 msgid "it seems that there is already a window manager running" -msgstr "Sembra che ci sia già un altro gestore di finestre in esecuzione." +msgstr "sembra che ci sia già un altro gestore di finestre in esecuzione." -#: ../src/startup.c:942 +#: ../src/startup.c:826 #, c-format msgid "could not manage screen %i" -msgstr "Impossibile gestire lo schermo %i" +msgstr "impossibile gestire lo schermo %i" -#: ../src/startup.c:1010 +#: ../src/startup.c:885 msgid "could not manage any screen" -msgstr "Impossibile gestire alcuno schermo" +msgstr "impossibile gestire alcuno schermo" -#: ../src/switchmenu.c:114 +#: ../src/switchmenu.c:145 msgid "Windows" msgstr "Finestre" #: ../src/texture.c:329 ../src/texture.c:371 #, c-format msgid "image file \"%s\" used as texture could not be found." -msgstr "Impossibile trovare il file di immagine \"%s\" usato come trama." +msgstr "impossibile trovare il file di immagine \"%s\" usato come trama." #: ../src/texture.c:335 ../src/texture.c:377 #, c-format msgid "could not load texture pixmap \"%s\":%s" -msgstr "Impossibile caricare il pixmap della trama \"%s\": %s" +msgstr "impossibile caricare il pixmap della trama \"%s\": %s" #: ../src/texture.c:437 #, c-format msgid "library \"%s\" cound not be opened." -msgstr "Impossibile aprire la libreria \"%s\"." +msgstr "impossibile aprire la libreria \"%s\"." #: ../src/texture.c:446 #, c-format msgid "function \"%s\" not found in library \"%s\"" -msgstr "Funzione \"%s\" non trovata nella libreria \"%s\"" +msgstr "funzione \"%s\" non trovata nella libreria \"%s\"" #: ../src/texture.c:453 msgid "function textures not supported on this system, sorry." -msgstr "Le funzioni trama non sono supportate da questo sistema, mi dispiace." +msgstr "le funzioni trama non sono supportate da questo sistema." #: ../src/texture.c:598 msgid "could not allocate image buffer" -msgstr "Impossibile allocare il buffer per l'immagine" +msgstr "impossibile allocare il buffer per l'immagine" -#: ../src/wdefaults.c:434 +#: ../src/wdefaults.c:437 #, c-format msgid "could not find icon file \"%s\"" -msgstr "Impossibile trovare il file dell'icona \"%s\"" +msgstr "impossibile trovare il file dell'icona \"%s\"" -#: ../src/window.c:2794 ../src/window.c:2929 +#: ../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." @@ -1458,29 +1424,29 @@ "Sembra che BlocNum, BlocScorr o altri tasti simili siano attivati.\n" "Disattivali o alcune funzioni del mouse e scorciatoie non funzioneranno." -#: ../src/winmenu.c:129 +#: ../src/winmenu.c:125 msgid "" "This will kill the application.\n" "Any unsaved changes will be lost.\n" "Please confirm." msgstr "" -"Questo ucciderà l'applicazione.\n" +"Questo terminerà l'applicazione.\n" "Tutte le modifiche non salvate saranno perse.\n" -"Sei sicuro?" +"Continuare?" -#: ../src/winmenu.c:270 ../src/winmenu.c:278 +#: ../src/winmenu.c:268 ../src/winmenu.c:277 msgid "Set Shortcut" msgstr "Imposta scorciatoia" -#: ../src/winmenu.c:356 ../src/winmenu.c:401 +#: ../src/winmenu.c:355 ../src/winmenu.c:400 msgid "could not create submenu for window menu" -msgstr "Impossibile creare il sottomenu del menù della finestra" +msgstr "impossibile creare il sottomenu del menù della finestra" -#: ../src/winmenu.c:405 +#: ../src/winmenu.c:404 msgid "Keep on top" msgstr "In primo piano" -#: ../src/winmenu.c:410 +#: ../src/winmenu.c:409 msgid "Keep at bottom" msgstr "Tieni in fondo" @@ -1489,70 +1455,70 @@ #. * entries, you must update the command #defines in the top of #. * this file. #. -#: ../src/winmenu.c:438 ../src/winmenu.c:573 +#: ../src/winmenu.c:437 ../src/winmenu.c:571 msgid "Maximize" msgstr "Ingrandisci" -#: ../src/winmenu.c:446 ../src/winmenu.c:559 +#: ../src/winmenu.c:445 ../src/winmenu.c:557 msgid "Miniaturize" msgstr "Riduci a icona" -#: ../src/winmenu.c:455 ../src/winmenu.c:590 +#: ../src/winmenu.c:453 ../src/winmenu.c:588 msgid "Shade" msgstr "Arrotola" -#: ../src/winmenu.c:471 +#: ../src/winmenu.c:469 msgid "Resize/Move" msgstr "Sposta/Ridimensiona" -#: ../src/winmenu.c:479 +#: ../src/winmenu.c:477 msgid "Select" msgstr "Seleziona" -#: ../src/winmenu.c:487 +#: ../src/winmenu.c:485 msgid "Move To" msgstr "Sposta in" -#: ../src/winmenu.c:492 +#: ../src/winmenu.c:490 msgid "Attributes..." msgstr "Proprietà..." -#: ../src/winmenu.c:494 +#: ../src/winmenu.c:492 msgid "Options" msgstr "Opzioni" -#: ../src/winmenu.c:554 +#: ../src/winmenu.c:552 msgid "Deminiaturize" msgstr "Ripristina" -#: ../src/winmenu.c:568 +#: ../src/winmenu.c:566 msgid "Unmaximize" msgstr "Ripristina" -#: ../src/winmenu.c:585 +#: ../src/winmenu.c:583 msgid "Unshade" msgstr "Srotola" -#: ../src/winspector.c:385 +#: ../src/winspector.c:392 #, c-format msgid "Could not find icon \"%s\" specified for this window" msgstr "Impossibile trovare l'icona \"%s\" specificata per questa finestra" -#: ../src/winspector.c:401 +#: ../src/winspector.c:409 #, c-format msgid "Could not open specified icon \"%s\":%s" msgstr "Impossibile aprire l'icona specificata \"%s\":%s" -#: ../src/winspector.c:1137 +#: ../src/winspector.c:1129 #, c-format msgid "Inspecting %s.%s" -msgstr "Ispeziono %s.%s" +msgstr "Ispezione di %s.%s" -#: ../src/winspector.c:1163 +#: ../src/winspector.c:1155 msgid "Click in the window you wish to inspect." -msgstr "Cliccare nella finestra da ispezionare." +msgstr "Fare clic nella finestra da ispezionare." -#: ../src/winspector.c:1202 +#: ../src/winspector.c:1194 msgid "" "The configuration will apply to all\n" "windows that have their WM_CLASS\n" @@ -1564,55 +1530,55 @@ "proprietà WM_CLASS impostata\n" "al nome selezionato." -#: ../src/winspector.c:1231 +#: ../src/winspector.c:1223 msgid "Save" msgstr "Salva" -#: ../src/winspector.c:1239 +#: ../src/winspector.c:1231 msgid "Apply" msgstr "Applica" -#: ../src/winspector.c:1245 +#: ../src/winspector.c:1237 msgid "Reload" msgstr "Ricarica" -#: ../src/winspector.c:1254 ../src/winspector.c:1264 +#: ../src/winspector.c:1246 ../src/winspector.c:1256 msgid "Window Specification" msgstr "Specifica classe finestra" -#: ../src/winspector.c:1255 +#: ../src/winspector.c:1247 msgid "Window Attributes" msgstr "Attributi della finestra" -#: ../src/winspector.c:1256 +#: ../src/winspector.c:1248 msgid "Advanced Options" msgstr "Opzioni avanzate" -#: ../src/winspector.c:1257 +#: ../src/winspector.c:1249 msgid "Icon and Initial Workspace" msgstr "Icona e area di lavoro iniziale" -#: ../src/winspector.c:1258 +#: ../src/winspector.c:1250 msgid "Application Specific" msgstr "Specifiche dell'applicazione" -#: ../src/winspector.c:1272 +#: ../src/winspector.c:1264 msgid "Defaults for all windows" msgstr "Predefinito per tutte le finestre" -#: ../src/winspector.c:1326 +#: ../src/winspector.c:1318 msgid "Select window" msgstr "Seleziona finestra" -#: ../src/winspector.c:1340 +#: ../src/winspector.c:1332 msgid "Attributes" msgstr "Attributi" -#: ../src/winspector.c:1351 +#: ../src/winspector.c:1343 msgid "Disable titlebar" msgstr "Elimina la barra del titolo" -#: ../src/winspector.c:1353 +#: ../src/winspector.c:1345 msgid "" "Remove the titlebar of this window.\n" "To access the window commands menu of a window\n" @@ -1622,70 +1588,71 @@ msgstr "" "Elimina la barra del titolo di questa finestra.\n" "Per accedere al menù di una finestra senza\n" -"barra del titolo, usa Control+Esc (oppure il tuo\n" -"shortcut, se hai cambiato il valore di default)." +"barra del titolo, usare Control+Esc (oppure la\n" +"scorciatoia impostata, se è stato cambiato il\n" +"valore predefinito)." -#: ../src/winspector.c:1360 +#: ../src/winspector.c:1352 msgid "Disable resizebar" msgstr "Elimina barra di ridimensionamento" -#: ../src/winspector.c:1362 +#: ../src/winspector.c:1354 msgid "Remove the resizebar of this window." msgstr "Elimina la barra di ridimensionamento dalla finestra." -#: ../src/winspector.c:1365 +#: ../src/winspector.c:1357 msgid "Disable close button" msgstr "Elimina il pulsante Chiudi" -#: ../src/winspector.c:1367 +#: ../src/winspector.c:1359 msgid "Remove the `close window' button of this window." -msgstr "Elimina il pulsante `chiudi finestra' da questa finestra." +msgstr "Elimina il pulsante 'Chiudi finestra' da questa finestra." -#: ../src/winspector.c:1370 +#: ../src/winspector.c:1362 msgid "Disable miniaturize button" msgstr "Elimina il pulsante Riduci a icona" -#: ../src/winspector.c:1372 +#: ../src/winspector.c:1364 msgid "Remove the `miniaturize window' button of the window." -msgstr "Elimina il pulsante `riduci a icona' da questa finestra." +msgstr "Elimina il pulsante 'Riduci a icona' da questa finestra." -#: ../src/winspector.c:1375 +#: ../src/winspector.c:1367 msgid "Disable border" msgstr "Elimina il bordo" -#: ../src/winspector.c:1377 +#: ../src/winspector.c:1369 msgid "Remove the 1 pixel black border around the window." msgstr "Elimina il bordo nero di 1 pixel attorno alla finestra." -#: ../src/winspector.c:1380 +#: ../src/winspector.c:1372 msgid "Keep on top (floating)" msgstr "Mantieni in primo piano" -#: ../src/winspector.c:1382 +#: ../src/winspector.c:1374 msgid "" "Keep the window over other windows, not allowing\n" "them to cover it." msgstr "" "Mantiene la finestra sopra tutte le altre,\n" -"ipedendo che esse la coprano." +"impedendo che esse la coprano." -#: ../src/winspector.c:1386 +#: ../src/winspector.c:1378 msgid "Keep at bottom (sunken)" msgstr "Mantieni in fondo" -#: ../src/winspector.c:1388 +#: ../src/winspector.c:1380 msgid "Keep the window under all other windows." msgstr "Mantiene la finestra dietro a tutte le altre." -#: ../src/winspector.c:1393 +#: ../src/winspector.c:1385 msgid "Make window present in all workspaces." msgstr "La finestra è presente in tutte le aree di lavoro." -#: ../src/winspector.c:1396 +#: ../src/winspector.c:1388 msgid "Start miniaturized" msgstr "Avvia ridotta ad icona" -#: ../src/winspector.c:1398 +#: ../src/winspector.c:1390 msgid "" "Make the window be automatically miniaturized when it's\n" "first shown." @@ -1693,11 +1660,11 @@ "La finestra viene automaticamente ridotta ad icona\n" "quando appare la prima volta." -#: ../src/winspector.c:1402 +#: ../src/winspector.c:1394 msgid "Start maximized" msgstr "Avvia massimizzata" -#: ../src/winspector.c:1404 +#: ../src/winspector.c:1396 msgid "" "Make the window be automatically maximized when it's\n" "first shown." @@ -1705,11 +1672,11 @@ "La finestra viene automaticamente massimizzata\n" "quando appare la prima volta." -#: ../src/winspector.c:1408 +#: ../src/winspector.c:1400 msgid "Full screen maximization" msgstr "Massimizza a tutto schermo" -#: ../src/winspector.c:1410 +#: ../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" @@ -1720,51 +1687,52 @@ "di ridimensionamento vengono spostate fuori dallo\n" "schermo." -#: ../src/winspector.c:1427 +#: ../src/winspector.c:1419 msgid "Advanced" msgstr "Avanzate" -#: ../src/winspector.c:1444 +#: ../src/winspector.c:1436 msgid "Do not bind keyboard shortcuts" msgstr "Blocca gli shortcut di tastiera" -#: ../src/winspector.c:1446 +#: ../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 "" -"Window Maker non risponde agli shortcut di tastiera quando\n" +"Window Maker non risponde alle scorciatoie di tastiera quando\n" "questa finestra è attiva. Ciò fà sì che l'applicazione riceva\n" "tutti i tasti premuti, indipendentemente dalla configurazione\n" -"degli shortcut." +"delle scorciatoie." -#: ../src/winspector.c:1452 +#: ../src/winspector.c:1444 msgid "Do not bind mouse clicks" -msgstr "Blocca i click del mouse" +msgstr "Blocca i clic del mouse" -#: ../src/winspector.c:1454 +# FIXME UPSTREAM: haveconfigured -> have configured REPORTED +#: ../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)." msgstr "" -"Non risponde alle azioni del mouse, come `Alt'+trascina\n" -"nella finestra (se Alt è il modificatore che hai configurato)." +"Non risponde alle azioni del mouse, come 'Alt'+trascina\n" +"nella finestra (se Alt è il modificatore configurato)." -#: ../src/winspector.c:1459 +#: ../src/winspector.c:1451 msgid "Do not show in the window list" msgstr "Non mostrare nella lista finestre" -#: ../src/winspector.c:1461 +#: ../src/winspector.c:1453 msgid "Do not list the window in the window list menu." msgstr "La finestra non viene mostrata nel menù delle finestre aperte." -#: ../src/winspector.c:1464 +#: ../src/winspector.c:1456 msgid "Do not let it take focus" msgstr "Non permettere che riceva il focus" -#: ../src/winspector.c:1466 +#: ../src/winspector.c:1458 msgid "" "Do not let the window take keyboard focus when you\n" "click on it." @@ -1772,11 +1740,11 @@ "Evita che la finestra riceva il focus di tastiera\n" "cliccandovi sopra." -#: ../src/winspector.c:1470 +#: ../src/winspector.c:1462 msgid "Keep inside screen" msgstr "Mantieni nello scermo" -#: ../src/winspector.c:1472 +#: ../src/winspector.c:1464 msgid "" "Do not allow the window to move itself completely\n" "outside the screen. For bug compatibility.\n" @@ -1784,23 +1752,23 @@ "Evita che la finestra vada completamente fuori dallo\n" "schermo. Per compatibilità con qualche bug.\n" -#: ../src/winspector.c:1476 +#: ../src/winspector.c:1468 msgid "Ignore 'Hide Others'" -msgstr "Ignora `Nascondi gli altri'" +msgstr "Ignora 'Nascondi gli altri'" -#: ../src/winspector.c:1478 +#: ../src/winspector.c:1470 msgid "" "Do not hide the window when issuing the\n" "`HideOthers' command." msgstr "" "La finstra non viene nascosta quando si invoca\n" -"il comando `Nascondi gli altri' (HideOthers)." +"il comando 'Nascondi gli altri'." -#: ../src/winspector.c:1482 +#: ../src/winspector.c:1474 msgid "Ignore 'Save Session'" -msgstr "Ignora `Salva sessione'" +msgstr "Ignora 'Salva sessione'" -#: ../src/winspector.c:1484 +#: ../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" @@ -1811,11 +1779,11 @@ "in modo che non venga avviata quando parte\n" "Window Maker." -#: ../src/winspector.c:1490 +#: ../src/winspector.c:1482 msgid "Emulate application icon" msgstr "Emula l'icona dell'applicazione" -#: ../src/winspector.c:1492 +#: ../src/winspector.c:1484 msgid "" "Make this window act as an application that provides\n" "enough information to Window Maker for a dockable\n" @@ -1825,55 +1793,55 @@ "che fornisce le informazioni necessarie a Window Maker\n" "per creare un'icona corretta." -#: ../src/winspector.c:1498 +#: ../src/winspector.c:1490 msgid "Disable language button" msgstr "Disabilita il pulsante della lingua" -#: ../src/winspector.c:1500 +#: ../src/winspector.c:1492 msgid "Remove the `toggle language' button of the window." -msgstr "Elimina il pulsante `cambia lingua' da questa finestra." +msgstr "Elimina il pulsante 'Cambia lingua' da questa finestra." -#: ../src/winspector.c:1517 +#: ../src/winspector.c:1509 msgid "Miniwindow Image" msgstr "Icona" -#: ../src/winspector.c:1544 +#: ../src/winspector.c:1536 msgid "Icon filename:" msgstr "Nome file:" -#: ../src/winspector.c:1557 +#: ../src/winspector.c:1549 msgid "Ignore client supplied icon" msgstr "Ignora l'icona dell'applicazione" -#: ../src/winspector.c:1564 +#: ../src/winspector.c:1556 msgid "Initial Workspace" msgstr "Area di lavoro iniziale" -#: ../src/winspector.c:1566 +#: ../src/winspector.c:1558 msgid "The workspace to place the window when it'sfirst shown." msgstr "L'area di lavoro in cui la finestra appare la prima volta." -#: ../src/winspector.c:1572 +#: ../src/winspector.c:1564 msgid "Nowhere in particular" msgstr "Nessuna in particolare" -#: ../src/winspector.c:1590 +#: ../src/winspector.c:1582 msgid "Application Attributes" msgstr "Attributi dell'applicazione" -#: ../src/winspector.c:1601 +#: ../src/winspector.c:1593 msgid "Start hidden" msgstr "Avvia nascosta" -#: ../src/winspector.c:1603 +#: ../src/winspector.c:1595 msgid "Automatically hide application when it's started." msgstr "Nascondi automaticamente l'applicazione all'avvio." -#: ../src/winspector.c:1606 +#: ../src/winspector.c:1598 msgid "No application icon" msgstr "Disabilita l'icona" -#: ../src/winspector.c:1608 +#: ../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" @@ -1885,35 +1853,35 @@ "icone che già sono sul dock non funzioneranno\n" "correttamente." -#: ../src/winspector.c:1614 -msgid "Collapse application icons" -msgstr "Collassa le icone" +#: ../src/winspector.c:1606 +msgid "Shared application icon" +msgstr "Icona condivisa dell'applicazione" -#: ../src/winspector.c:1616 +#: ../src/winspector.c:1608 msgid "" -"Collapse application icons from other instances\n" -"of this application into one.\n" +"Use a single shared application icon for all of\n" +"the instances of this application.\n" msgstr "" -"Collassa le icone di tutte le istanze\n" -"dell'applicazione in una sola.\n" +"Una sola icona condivisa per tutte le istanze\n" +"di questa applicazione.\n" -#: ../src/workspace.c:110 ../src/workspace.c:111 ../src/workspace.c:897 +#: ../src/workspace.c:103 ../src/workspace.c:104 ../src/workspace.c:1302 #, c-format msgid "Workspace %i" msgstr "Area %i" -#: ../src/workspace.c:954 +#: ../src/workspace.c:1352 msgid "Workspaces" msgstr "Aree di lavoro" -#: ../src/workspace.c:956 +#: ../src/workspace.c:1354 msgid "could not create Workspace menu" -msgstr "Impossibile creare il menù Aree di lavoro" +msgstr "impossibile creare il menù Aree di lavoro" -#: ../src/workspace.c:963 +#: ../src/workspace.c:1361 msgid "New" msgstr "Nuova" -#: ../src/workspace.c:964 +#: ../src/workspace.c:1362 msgid "Destroy Last" msgstr "Elimina l'ultima" diff -Naur WindowMaker-0.91.0/po/ja.po wm/po/ja.po --- WindowMaker-0.91.0/po/ja.po 2004-10-26 07:52:38 +0400 +++ wm/po/ja.po 2004-10-27 00:03:06 +0400 @@ -6,38 +6,39 @@ # modified by Takeo Hashimoto # collaborated with members in wmaker-jp-ML and Project Vine # -# Last Update: version 0.65.1 +# Last Update: for version 0.91.0 # msgid "" msgstr "" -"Project-Id-Version: WindowMaker 0.65.1\n" -"POT-Creation-Date: 2001-09-08 12:31+0900\n" -"PO-Revision-Date: 2001-09-14 02:40+0900\n" +"Project-Id-Version: WindowMaker 0.90.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 21:50+0900\n" +"PO-Revision-Date: 2004-10-26 22:00+0900\n" "Last-Translator: Takeo Hashimoto \n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" -#: ../src/appicon.c:542 ../src/dialog.c:224 ../src/dock.c:3244 -#: ../src/dockedapp.c:212 ../src/main.c:256 ../src/rootmenu.c:1815 -#: ../src/winspector.c:388 ../src/winspector.c:405 +#: ../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 "エラー" -#: ../src/appicon.c:543 +#: ../src/appicon.c:416 msgid "Could not open specified icon file" -msgstr "指定されたアイコンファイルを開けません" +msgstr "指定のアイコンファイルが開けません" -#: ../src/appicon.c:544 ../src/dialog.c:121 ../src/dialog.c:224 -#: ../src/dialog.c:672 ../src/dialog.c:1735 ../src/dock.c:493 -#: ../src/dock.c:501 ../src/dock.c:525 ../src/dock.c:3245 -#: ../src/dockedapp.c:213 ../src/dockedapp.c:371 ../src/main.c:256 -#: ../src/rootmenu.c:1819 ../src/winspector.c:389 ../src/winspector.c:406 +#: ../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 "了解" -#: ../src/appicon.c:571 ../src/dock.c:256 +#: ../src/appicon.c:445 ../src/dock.c:244 msgid "" " will be forcibly closed.\n" "Any unsaved changes will be lost.\n" @@ -45,339 +46,376 @@ msgstr "" " を強制終了させます\n" "保存されていない変更は全て失われます\n" -"終了させますか？" +"終了させますか？ " -#: ../src/appicon.c:577 ../src/dock.c:261 ../src/winmenu.c:128 +#: ../src/appicon.c:453 ../src/dock.c:263 ../src/winmenu.c:124 msgid "Kill Application" msgstr "アプリケーション強制終了" -#: ../src/appicon.c:578 ../src/dock.c:262 ../src/winmenu.c:130 +#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126 msgid "Yes" msgstr "はい" -#: ../src/appicon.c:578 ../src/dock.c:262 ../src/winmenu.c:130 +#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126 msgid "No" msgstr "いいえ" -#: ../src/appicon.c:596 ../src/dock.c:1139 ../src/dock.c:3410 +#: ../src/appicon.c:484 ../src/dock.c:1168 ../src/dock.c:3501 msgid "Unhide Here" msgstr "このワークスペースで元に戻す" -#: ../src/appicon.c:597 ../src/appicon.c:623 ../src/dock.c:1141 -#: ../src/dock.c:1143 ../src/dock.c:3422 ../src/winmenu.c:465 +#: ../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 "隠す" -#: ../src/appicon.c:598 ../src/appicon.c:629 -msgid "Collapse" -msgstr "折り畳む" - -#: ../src/appicon.c:599 +#: ../src/appicon.c:486 msgid "Set Icon..." msgstr "アイコン設定..." -#: ../src/appicon.c:600 ../src/dock.c:1147 ../src/rootmenu.c:223 -#: ../src/rootmenu.c:237 ../src/winmenu.c:512 +#: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248 +#: ../src/rootmenu.c:264 ../src/winmenu.c:508 msgid "Kill" msgstr "強制終了" -#: ../src/appicon.c:621 ../src/dock.c:3420 +#: ../src/appicon.c:508 ../src/dock.c:3511 msgid "Unhide" msgstr "元に戻す" -#: ../src/appicon.c:627 -msgid "Uncollapse" -msgstr "広げる" +#: ../src/application.c:405 +#, c-format +msgid "recreating missing icon '%s'" +msgstr "行方不明アイコン '%s' の再作成" + +#: ../src/defaults.c:933 ../src/defaults.c:1095 +#, c-format +msgid "Domain %s (%s) of global defaults database is corrupted!" +msgstr "グローバル標準データベースのドメイン%s (%s)がおかしいです!" + +#: ../src/defaults.c:938 +#, c-format +msgid "could not load domain %s from global defaults database" +msgstr "グローバル標準データベースからドメイン %s をロードできません" -#: ../src/defaults.c:917 ../src/startup.c:890 ../src/startup.c:908 -#: ../src/startup.c:914 +#: ../src/defaults.c:990 ../src/defaults.c:1005 +#, c-format +msgid "invalid global menu file %s" +msgstr "グローバルメニューファイル %s が間違っています" + +#: ../src/defaults.c:1033 ../src/startup.c:762 ../src/startup.c:780 +#: ../src/startup.c:787 #, c-format msgid "could not read domain \"%s\" from defaults database" msgstr "標準データベースからドメイン\"%s\"を読み込むことができません" -#: ../src/defaults.c:963 ../src/defaults.c:1088 ../src/defaults.c:1127 -#: ../src/defaults.c:1173 +#: ../src/defaults.c:1079 ../src/defaults.c:1184 ../src/defaults.c:1225 +#: ../src/defaults.c:1281 #, c-format msgid "Domain %s (%s) of defaults database is corrupted!" -msgstr "標準データベースのドメイン%s (%s)がおかしいです!" +msgstr "標準データベースのドメイン %s (%s)がおかしいです!" -#: ../src/defaults.c:968 ../src/defaults.c:1109 ../src/defaults.c:1156 -#: ../src/defaults.c:1182 +#: ../src/defaults.c:1084 ../src/defaults.c:1204 ../src/defaults.c:1261 +#: ../src/defaults.c:1291 #, c-format msgid "could not load domain %s from user defaults database" -msgstr "ユーザ標準データベースからドメイン%sをロードできません" +msgstr "ユーザ標準データベースからドメイン %s をロードできません" -#: ../src/defaults.c:979 ../src/defaults.c:1073 +#: ../src/defaults.c:1114 #, c-format -msgid "Domain %s (%s) of global defaults database is corrupted!" -msgstr "グローバル標準データベースのドメイン%s (%s)がおかしいです!" +msgid "could not load domain %s from global defaults database (%s)" +msgstr "グローバル標準データベース(%s)からドメイン %s をロードできません" -#: ../src/defaults.c:998 +#: ../src/defaults.c:1251 ../src/screen.c:419 #, c-format -msgid "could not load domain %s from global defaults database (%s)" -msgstr "グローバル標準データベース(%s)からドメイン%sをロードできません" +msgid "could not load logo image for panels: %s" +msgstr "パネル用のロゴ画像 %s が読み込めません" -#: ../src/defaults.c:1078 +#. --------------------------- Local ----------------------- +#: ../src/defaults.c:1500 ../src/defaults.c:1639 ../src/defaults.c:1765 +#: ../src/defaults.c:2243 ../src/defaults.c:2260 ../src/defaults.c:2305 +#: ../src/defaults.c:2352 ../src/defaults.c:2825 ../src/wdefaults.c:571 +#: ../src/wdefaults.c:604 #, c-format -msgid "could not load domain %s from global defaults database" -msgstr "グローバル標準データベースからドメイン%sをロードできません" +msgid "Wrong option format for key \"%s\". Should be %s." +msgstr "\"%s\"に対するオプション形式が違います. %s型にして下さい" -#: ../src/defaults.c:1146 ../src/screen.c:458 +#: ../src/defaults.c:1502 ../src/defaults.c:1583 ../src/defaults.c:1613 +#: ../src/defaults.c:1644 ../src/defaults.c:1657 ../src/defaults.c:1672 +#: ../src/defaults.c:1686 ../src/defaults.c:1770 ../src/defaults.c:1782 +#: ../src/defaults.c:2248 ../src/defaults.c:2265 ../src/defaults.c:2278 +#: ../src/defaults.c:2310 ../src/defaults.c:2326 ../src/defaults.c:2357 +#: ../src/defaults.c:2444 ../src/defaults.c:2830 ../src/defaults.c:2841 #, c-format -msgid "could not load logo image for panels: %s" -msgstr "パネル用のロゴ画像が読み込めません: %s" +msgid "using default \"%s\" instead" +msgstr "代わりに標準の設定\"%s\"を使います" -#: ../src/defaults.c:1424 +#: ../src/defaults.c:1533 #, c-format msgid "wrong option value for key \"%s\". Should be one of %s" -msgstr "キー\"%s\"に対するオプション形式が違います. %s型にして下さい" +msgstr "キー\"%s\"に対するオプション形式が違います. %s のどれかにして下さい" -#: ../src/defaults.c:1469 +#: ../src/defaults.c:1578 #, c-format msgid "can't convert \"%s\" to boolean for key \"%s\"" msgstr "\"%s\"(\"%s\"の引数)をboolean型へ変換できません" -#: ../src/defaults.c:1474 ../src/defaults.c:1506 ../src/defaults.c:1538 -#: ../src/defaults.c:1551 ../src/defaults.c:1566 ../src/defaults.c:1580 -#: ../src/defaults.c:1650 ../src/defaults.c:1662 ../src/defaults.c:2129 -#: ../src/defaults.c:2146 ../src/defaults.c:2159 ../src/defaults.c:2191 -#: ../src/defaults.c:2207 ../src/defaults.c:2238 ../src/defaults.c:2325 -#: ../src/defaults.c:2713 ../src/defaults.c:2724 -#, c-format -msgid "using default \"%s\" instead" -msgstr "代わりに標準の設定\"%s\"を使います" - -#: ../src/defaults.c:1503 +#: ../src/defaults.c:1610 #, c-format msgid "can't convert \"%s\" to integer for key \"%s\"" msgstr "\"%s\"(\"%s\"の引数)を整数(integer型)へ変換できません" -#: ../src/defaults.c:1533 ../src/defaults.c:1645 ../src/defaults.c:2124 -#: ../src/defaults.c:2141 ../src/defaults.c:2186 ../src/defaults.c:2233 -#: ../src/defaults.c:2708 ../src/wdefaults.c:570 ../src/wdefaults.c:606 -#, c-format -msgid "Wrong option format for key \"%s\". Should be %s." -msgstr "\"%s\"に対するオプション形式が違います. %s型にして下さい" - -#: ../src/defaults.c:1546 +#: ../src/defaults.c:1652 #, c-format msgid "Incorrect number of elements in array for key \"%s\"." msgstr "\"%s\"に対する要素数が正しくありません" -#: ../src/defaults.c:1561 +#: ../src/defaults.c:1667 #, c-format msgid "Wrong value for key \"%s\". Should be Coordinate." msgstr "\"%s\"に対する指定が不正です. Coordinate型にしてください" -#: ../src/defaults.c:1576 +#: ../src/defaults.c:1682 #, c-format msgid "can't convert array to integers for \"%s\"." msgstr "\"%s\"に対して整数列へ変換できません" -#: ../src/defaults.c:1774 ../src/defaults.c:1806 ../src/defaults.c:1822 -#: ../src/defaults.c:1851 ../src/defaults.c:1874 ../src/defaults.c:1927 -#: ../src/defaults.c:1967 ../src/defaults.c:2005 ../src/defaults.c:2021 +#: ../src/defaults.c:1715 +#, fuzzy, c-format +msgid "Wrong value for key \"%s\". Should be an array." +msgstr "\"%s\"に対する指定が不正です. Coordinate型にしてください" + +#: ../src/defaults.c:1893 ../src/defaults.c:1925 ../src/defaults.c:1941 +#: ../src/defaults.c:1970 ../src/defaults.c:1993 ../src/defaults.c:2046 +#: ../src/defaults.c:2086 ../src/defaults.c:2124 ../src/defaults.c:2140 #, c-format msgid "\"%s\" is not a valid color name" msgstr "カラー名の指定\"%s\"が間違っています" -#: ../src/defaults.c:1787 ../src/defaults.c:1839 +#: ../src/defaults.c:1906 ../src/defaults.c:1958 msgid "bad number of arguments in gradient specification" msgstr "グラデーション指定の引数の数が間違っています" -#: ../src/defaults.c:1900 +#: ../src/defaults.c:2019 msgid "too few arguments in multicolor gradient specification" msgstr "マルチカラーのグラデーション指定の引数が足りません" -#: ../src/defaults.c:1994 +#: ../src/defaults.c:2113 msgid "bad number of arguments in textured gradient specification" msgstr "グラデーション指定の引数の数が間違っています" -#: ../src/defaults.c:2037 +#: ../src/defaults.c:2156 #, c-format msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]" msgstr "不透明度には %s は指定できません. 0 から 255 で指定してください" -#: ../src/defaults.c:2097 +#: ../src/defaults.c:2216 #, c-format msgid "could not initialize library %s" msgstr "%s ライブラリの初期化ができませんでした" -#: ../src/defaults.c:2100 +#: ../src/defaults.c:2219 #, c-format msgid "could not find function %s::%s" msgstr "%s::%s 関数が見つかりませんでした" -#: ../src/defaults.c:2107 +#: ../src/defaults.c:2226 #, c-format msgid "invalid texture type %s" msgstr "テクスチャのタイプ %s が不正です" -#: ../src/defaults.c:2154 +#: ../src/defaults.c:2273 #, c-format msgid "Error in texture specification for key \"%s\"" msgstr "`%s'に対するテクスチャの指定エラーです" -#: ../src/defaults.c:2203 +#: ../src/defaults.c:2322 msgid "Wrong type for workspace background. Should be a texture type." msgstr "ワークスペース背景の形式が違います. Texture型にしてください" -#: ../src/defaults.c:2251 +#: ../src/defaults.c:2370 #, c-format msgid "Wrong type for background of workspace %i. Should be a texture." msgstr "ワークスペース %i の背景の形式が違います. Texture型にしてください" -#: ../src/defaults.c:2293 +#: ../src/defaults.c:2412 msgid "could not load any usable font!!!" -msgstr "使用できるフォントが読み込めません!!" +msgstr "使用できるフォントが見当たりません!!!" -#: ../src/defaults.c:2320 +#: ../src/defaults.c:2439 #, c-format msgid "could not get color for key \"%s\"" msgstr "\"%s\"に対するカラーが得られません" -#: ../src/defaults.c:2378 ../src/rootmenu.c:491 +#: ../src/defaults.c:2497 ../src/rootmenu.c:531 #, c-format msgid "%s:invalid key modifier \"%s\"" msgstr "%s:キーの指定\"%s\"が間違っています" -#: ../src/defaults.c:2390 +#: ../src/defaults.c:2509 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\"" msgstr "%s:ショートカット\"%s\"のキー指定が間違っています" -#: ../src/defaults.c:2397 +#: ../src/defaults.c:2516 #, c-format msgid "%s:invalid key in shortcut \"%s\"" msgstr "%s:ショートカット\"%s\"のキー指定が間違っています" -#: ../src/defaults.c:2422 +#: ../src/defaults.c:2541 #, c-format msgid "%s: modifier key %s is not valid" msgstr "%s:キー%sの設定が適切でありません" -#: ../src/defaults.c:2454 +#: ../src/defaults.c:2573 #, c-format msgid "could not load image in option %s: %s" msgstr "%s 指定で画像を読み込めません: %s" -#: ../src/defaults.c:2573 +#: ../src/defaults.c:2690 #, c-format msgid "failed to open bitmap file \"%s\"" msgstr "ビットマップファイル \"%s\" を開けません" -#: ../src/defaults.c:2576 +#: ../src/defaults.c:2693 #, c-format msgid "\"%s\" is not a valid bitmap file" msgstr "\"%s\" は正しいビットマップファイルではありません" -#: ../src/defaults.c:2579 +#: ../src/defaults.c:2696 #, c-format msgid "out of memory reading bitmap file \"%s\"" msgstr "ビットマップファイル \"%s\" を読んでいるときにメモリが不足しました" -#: ../src/defaults.c:2618 ../src/defaults.c:2651 +#: ../src/defaults.c:2735 ../src/defaults.c:2768 msgid "bad number of arguments in cursor specification" msgstr "カーソル指定の引数の数が間違っています" -#: ../src/defaults.c:2634 +#: ../src/defaults.c:2751 #, c-format msgid "unknown builtin cursor name \"%s\"" msgstr "\"%s\" という組み込みカーソルはわかりません" -#: ../src/defaults.c:2661 ../src/defaults.c:2673 +#: ../src/defaults.c:2778 ../src/defaults.c:2790 #, c-format msgid "could not find cursor bitmap file \"%s\"" msgstr "カーソルビットマップ \"%s\" を見つけられません" -#: ../src/defaults.c:2720 +#: ../src/defaults.c:2837 #, c-format msgid "Error in cursor specification for key \"%s\"" msgstr "\"%s\" に対するカーソルの指定エラーです" -#: ../src/defaults.c:2807 +#: ../src/defaults.c:2922 msgid "could not render texture for icon background" msgstr "アイコン背景のテクスチャのレンダリングができませんでした" -#: ../src/dialog.c:121 ../src/dialog.c:679 ../src/dock.c:525 -#: ../src/dockedapp.c:377 ../src/rootmenu.c:185 ../src/rootmenu.c:223 -#: ../src/rootmenu.c:237 +#: ../src/defaults.c:3542 ../src/defaults.c:3617 +#, fuzzy, c-format +msgid "Invalid arguments for option \"%s\"" +msgstr "%s: 無効な引数です '%s'\n" + +#: ../src/defaults.c:3549 ../src/defaults.c:3624 +#, fuzzy, c-format +msgid "Could not find image \"%s\" for option \"%s\"" +msgstr "%s 指定で画像を読み込めません: %s" + +#: ../src/defaults.c:3555 ../src/defaults.c:3632 +#, fuzzy, c-format +msgid "Could not load image \"%s\" for option \"%s\"" +msgstr "%s 指定で画像を読み込めません: %s" + +#: ../src/defaults.c:3567 +msgid "Invalid split sizes for SwitchPanel back image." +msgstr "" + +#: ../src/defaults.c:3640 +#, fuzzy, c-format +msgid "Invalid number of arguments for option \"%s\"" +msgstr "カーソル指定の引数の数が間違っています" + +#: ../src/dialog.c:147 +msgid "Save workspace state" +msgstr "ワークスペースの状態保存" + +#: ../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 "キャンセル" -#: ../src/dialog.c:219 +#: ../src/dialog.c:290 msgid "Could not open directory " msgstr "ディレクトリを開けません" -#: ../src/dialog.c:274 +#: ../src/dialog.c:345 msgid "Could not load image file " msgstr "画像ファイルを読み込めません" -#: ../src/dialog.c:606 +#: ../src/dialog.c:659 msgid "Directories" msgstr "ディレクトリ" -#: ../src/dialog.c:615 +#: ../src/dialog.c:668 msgid "Icons" msgstr "アイコン" -#: ../src/dialog.c:648 +#: ../src/dialog.c:701 msgid "Preview" msgstr "プレビュー" -#: ../src/dialog.c:661 +#: ../src/dialog.c:714 msgid "File Name:" msgstr "ファイル名:" -#: ../src/dialog.c:685 +#: ../src/dialog.c:738 msgid "Choose File" msgstr "ファイル選択" -#: ../src/dialog.c:703 ../src/dialog.c:705 +#: ../src/dialog.c:757 ../src/dialog.c:759 msgid "Icon Chooser" msgstr "アイコン選択" -#: ../src/dialog.c:1162 ../src/dialog.c:1272 +#: ../src/dialog.c:1196 ../src/dialog.c:1304 #, c-format msgid "Version %s" msgstr "バージョン %s" -#: ../src/dialog.c:1269 +#: ../src/dialog.c:1302 msgid "Window Manager for X" -msgstr "X ウィンドウマネージャ" +msgstr "Window Manager for X" -#: ../src/dialog.c:1292 -#, fuzzy, c-format +#: ../src/dialog.c:1325 +#, c-format msgid "Using visual 0x%x: %s %ibpp " -msgstr "Using visual 0x%x: %s %ibpp " +msgstr "Using visual 0x%x: %s %ibpp" -#: ../src/dialog.c:1300 +#: ../src/dialog.c:1333 msgid "(32 thousand colors)\n" msgstr "(3 万 2 千色)\n" -#: ../src/dialog.c:1303 +#: ../src/dialog.c:1336 msgid "(64 thousand colors)\n" msgstr "(6 万 4 千色)\n" -#: ../src/dialog.c:1307 +#: ../src/dialog.c:1340 msgid "(16 million colors)\n" msgstr "(1,600 万色)\n" -#: ../src/dialog.c:1310 +#: ../src/dialog.c:1343 #, c-format msgid "(%d colors)\n" msgstr "(%d 色)\n" -#: ../src/dialog.c:1320 +#: ../src/dialog.c:1353 #, c-format msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n" msgstr "割当メモリ: %i kB. 使用中メモリ: %i kB.\n" -#: ../src/dialog.c:1327 +#: ../src/dialog.c:1360 msgid "Supported image formats: " msgstr "対応画像形式: " -#: ../src/dialog.c:1334 +#: ../src/dialog.c:1367 msgid "" "\n" "Additional support for: " @@ -385,11 +423,11 @@ "\n" "拡張対応: " -#: ../src/dialog.c:1357 +#: ../src/dialog.c:1384 msgid " and " msgstr ", あと, " -#: ../src/dialog.c:1367 +#: ../src/dialog.c:1394 msgid "" "\n" "Sound disabled" @@ -397,7 +435,7 @@ "\n" "サウンド無効" -#: ../src/dialog.c:1369 +#: ../src/dialog.c:1396 msgid "" "\n" "Sound enabled" @@ -405,47 +443,65 @@ "\n" "サウンド有効" -#: ../src/dialog.c:1393 +#: ../src/dialog.c:1401 +msgid ", VirtualDesktop enabled" +msgstr ", 仮想デスクトップ有効" + +#: ../src/dialog.c:1403 +msgid ", VirtualDesktop disabled" +msgstr ", 仮想デスクトップ無効" + +#: ../src/dialog.c:1407 +msgid "\n" +msgstr "\n" + +#: ../src/dialog.c:1409 +msgid "Solaris " +msgstr "Solaris " + +#: ../src/dialog.c:1411 +msgid "Xinerama: " +msgstr "Xinerama: " + +#: ../src/dialog.c:1445 msgid "Info" msgstr " 情報 " -#: ../src/dialog.c:1416 -msgid "Merry X'mas!" +#: ../src/dialog.c:1469 +msgid "Merry Christmas!" msgstr "メリークリスマス!" -#: ../src/dialog.c:1486 +#: ../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:1507 +#: ../src/dialog.c:1563 msgid "Legal" msgstr "" -#: ../src/dialog.c:1658 ../src/startup.c:388 +#: ../src/dialog.c:1719 msgid "cannot open connection for crashing dialog panel. Aborting." msgstr "ダイアログが壊れて接続できません. 中止します" -#: ../src/dialog.c:1684 +#: ../src/dialog.c:1745 msgid "Fatal error" msgstr "致命的なエラー" -#: ../src/dialog.c:1695 +#: ../src/dialog.c:1756 #, c-format msgid "" "Window Maker received signal %i\n" @@ -454,40 +510,40 @@ "Window Maker は シグナル %i を受けました\n" "(%s)." -#: ../src/dialog.c:1698 +#: ../src/dialog.c:1759 #, c-format msgid "Window Maker received signal %i." msgstr "Window Maker はシグナル %i を受けました" -#: ../src/dialog.c:1707 +#: ../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 "" -"この致命的なエラーはバグによるものかもしれません. バグフォームにしたがって " +"この致命的なエラーはバグによるものかもしれません. 同梱のバグフォームを使って " "bugs@windowmaker.org 宛てにレポートして下さい" -#: ../src/dialog.c:1716 +#: ../src/dialog.c:1777 msgid "What do you want to do now?" -msgstr "今, どうしますか?" +msgstr "さて, どうしますか?" -#: ../src/dialog.c:1722 +#: ../src/dialog.c:1783 msgid "Select action" msgstr "選んでください" -#: ../src/dialog.c:1723 +#: ../src/dialog.c:1784 msgid "Abort and leave a core file" msgstr "中止して core ファイルを残す" -#: ../src/dialog.c:1724 +#: ../src/dialog.c:1785 msgid "Restart Window Maker" msgstr "Window Maker を再起動する" -#: ../src/dialog.c:1725 +#: ../src/dialog.c:1786 msgid "Start alternate window manager" msgstr "かわりのウィンドウマネージャを起動する" -#: ../src/dialog.c:1903 +#: ../src/dialog.c:1964 msgid "" "Window Maker is part of the GNUstep project.\n" "The GNUstep project aims to create a free\n" @@ -500,480 +556,508 @@ "GNUstep, please visit: www.gnustep.org" msgstr "" -#: ../src/dialog.c:1923 +#: ../src/dialog.c:1987 msgid "About GNUstep" msgstr "" -#: ../src/dock.c:213 +#: ../src/dock.c:193 #, c-format msgid "Type the name for workspace %i:" -msgstr "ワークスペース%iの名前を入力して下さい:" +msgstr "ワークスペース%iの名前を入力して下さい: " -#: ../src/dock.c:214 ../src/dock.c:1103 ../src/dock.c:1106 ../src/dock.c:3328 +#: ../src/dock.c:194 ../src/dock.c:1132 ../src/dock.c:1135 ../src/dock.c:3419 msgid "Rename Workspace" msgstr "ワークスペース名の変更" -#: ../src/dock.c:487 ../src/dock.c:495 +#: ../src/dock.c:509 ../src/dock.c:517 msgid "Warning" msgstr "警告" -#: ../src/dock.c:488 +#: ../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 "" -"いくつかのアイコンを「どこでも表示」にできません. " -"他のアイコンが違うワークスペースで同じ場所にドックされていないことと, " -"クリップにワークスペースが埋めつくされていないことを確認してください" +"いくつかのアイコンを「どこでも表示」にできません. 他のアイコンが違うワークス" +"ペースで同じ場所にドックされていないことと, クリップにワークスペースが埋めつ" +"くされていないことを確認してください" -#: ../src/dock.c:496 +#: ../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 "" -"アイコンを「どこでも表示」にできません. " -"他のアイコンが違うワークスペースで同じ場所にドックされていないことと, " -"クリップにワークスペースが埋めつくされていないことを確認してください" +"アイコンを「どこでも表示」にできません. 他のアイコンが違うワークスペースで同" +"じ場所にドックされていないことと, クリップにワークスペースが埋めつくされてい" +"ないことを確認してください" -#: ../src/dock.c:523 +#: ../src/dock.c:545 msgid "Workspace Clip" -msgstr "ワークスペースクリップ" +msgstr "ワークスペース クリップ" -#: ../src/dock.c:524 +#: ../src/dock.c:546 msgid "All selected icons will be removed!" -msgstr "選択されたアイコン全てが削除されます" +msgstr "選択されたアイコン全てが削除されます!" -#: ../src/dock.c:575 ../src/dock.c:1118 ../src/dock.c:1120 ../src/dock.c:3364 +#: ../src/dock.c:598 ../src/dock.c:1147 ../src/dock.c:1149 ../src/dock.c:3455 msgid "Keep Icon" msgstr "アイコンを保持する" -#: ../src/dock.c:576 ../src/dock.c:2083 ../src/dock.c:2218 +#: ../src/dock.c:599 ../src/dock.c:2139 ../src/dock.c:2276 msgid "Type the command used to launch the application" msgstr "" "このアプリケーションを起動するための\n" "コマンドを入力してください" -#: ../src/dock.c:927 +#: ../src/dock.c:954 #, c-format msgid "could not launch application %s\n" msgstr "アプリケーション%sを起動できません\n" -#: ../src/dock.c:982 +#: ../src/dock.c:1010 msgid "could not create workspace submenu for Clip menu" msgstr "クリップメニューのワークスペースサブメニューが作成できません" -#: ../src/dock.c:1040 +#: ../src/dock.c:1069 msgid "could not create options submenu for Clip menu" msgstr "クリップメニューのオプションサブメニューが作成できません" -#: ../src/dock.c:1044 ../src/dock.c:1092 +#: ../src/dock.c:1073 ../src/dock.c:1121 msgid "Keep on Top" msgstr "常に一番上に表示" -#: ../src/dock.c:1050 +#: ../src/dock.c:1079 msgid "Collapsed" msgstr "折り畳む" -#: ../src/dock.c:1056 +#: ../src/dock.c:1085 msgid "Autocollapse" msgstr "自動的に折り畳む" -#: ../src/dock.c:1062 +#: ../src/dock.c:1091 msgid "Autoraise" msgstr "自動的に前面に表示" -#: ../src/dock.c:1068 +#: ../src/dock.c:1097 msgid "Autoattract Icons" msgstr "アイコンを自動的に引き寄せる" -#: ../src/dock.c:1098 +#: ../src/dock.c:1127 msgid "Clip Options" msgstr "クリップオプション" -#: ../src/dock.c:1108 +#: ../src/dock.c:1137 msgid "Selected" msgstr "選択" -#: ../src/dock.c:1113 ../src/dock.c:1116 ../src/dock.c:3355 +#: ../src/dock.c:1142 ../src/dock.c:1145 ../src/dock.c:3446 msgid "Select All Icons" msgstr "全てのアイコンの選択" -#: ../src/dock.c:1122 ../src/dock.c:1124 ../src/dock.c:3372 +#: ../src/dock.c:1151 ../src/dock.c:1153 ../src/dock.c:3463 msgid "Move Icon To" msgstr "アイコンを移動" -#: ../src/dock.c:1129 ../src/dock.c:1132 ../src/dock.c:3383 +#: ../src/dock.c:1158 ../src/dock.c:1161 ../src/dock.c:3474 msgid "Remove Icon" -msgstr "アイコンの削除" +msgstr "アイコンを削除" -#: ../src/dock.c:1134 +#: ../src/dock.c:1163 msgid "Attract Icons" msgstr "アイコンを引き寄せる" -#: ../src/dock.c:1137 +#: ../src/dock.c:1166 msgid "Launch" msgstr "起動" -#: ../src/dock.c:1145 +#: ../src/dock.c:1174 msgid "Settings..." msgstr "設定..." -#: ../src/dock.c:1504 ../src/dock.c:1607 +#: ../src/dock.c:1538 ../src/dock.c:1645 #, c-format msgid "bad value in docked icon state info %s" msgstr "登録されたアイコンの情報%sに不正な内容があります" -#: ../src/dock.c:1615 +#: ../src/dock.c:1653 #, c-format msgid "bad value in docked icon position %i,%i" msgstr "登録されたアイコンの位置(%i, %i)は不正な値です" -#: ../src/dock.c:1867 +#: ../src/dock.c:1673 +#, c-format +msgid "bad value in dock state info:%s" +msgstr "" + +#: ../src/dock.c:1923 msgid "there are too many icons stored in dock. Ignoring what doesn't fit" msgstr "登録されたアイコンが多すぎます. 内容の一部は無効になります" #. icon->forced_dock = 1; -#: ../src/dock.c:2082 ../src/dock.c:2217 +#: ../src/dock.c:2138 ../src/dock.c:2275 msgid "Dock Icon" msgstr "ドック登録アイコン" -#: ../src/dock.c:3237 ../src/dock.c:3241 +#: ../src/dock.c:3333 #, c-format msgid "Could not execute command \"%s\"" msgstr "コマンド\"%s\"を実行できません" -#: ../src/dock.c:3334 +#: ../src/dock.c:3425 msgid "Toggle Omnipresent" msgstr "どのワークスペースでも表示" -#: ../src/dock.c:3339 ../src/winmenu.c:417 ../src/winspector.c:1395 +#: ../src/dock.c:3430 ../src/winmenu.c:414 ../src/winspector.c:1383 msgid "Omnipresent" msgstr "どのワークスペースでも表示" -#: ../src/dock.c:3353 +#: ../src/dock.c:3444 msgid "Unselect All Icons" msgstr "全てのアイコンの選択解除" -#: ../src/dock.c:3362 +#: ../src/dock.c:3453 msgid "Keep Icons" msgstr "アイコンを保持する" -#: ../src/dock.c:3370 +#: ../src/dock.c:3461 msgid "Move Icons To" msgstr "アイコンを移動" -#: ../src/dock.c:3381 +#: ../src/dock.c:3472 msgid "Remove Icons" -msgstr "アイコンの削除" +msgstr "アイコンを削除" -#: ../src/dock.c:3412 +#: ../src/dock.c:3503 msgid "Bring Here" msgstr "持ってくる" -#: ../src/dockedapp.c:131 +#: ../src/dockedapp.c:150 #, c-format msgid "could not find icon %s, used in a docked application" -msgstr "登録されたアプリケーションで使われているアイコン%sが見つかりません" +msgstr "登録されたドックアプリで使われているアイコン %s が見つかりません" -#: ../src/dockedapp.c:211 +#: ../src/dockedapp.c:230 #, c-format msgid "Could not open specified icon file: %s" -msgstr "指定のアイコンファイルが開けません:%s" +msgstr "指定のアイコンファイルが開けません: %s" -#: ../src/dockedapp.c:213 +#: ../src/dockedapp.c:232 msgid "Ignore" msgstr "無視" -#: ../src/dockedapp.c:306 +#: ../src/dockedapp.c:334 msgid "Start when Window Maker is started" msgstr "Window Maker 起動時に一緒に起動" -#: ../src/dockedapp.c:313 +#: ../src/dockedapp.c:341 msgid "Lock (prevent accidental removal)" msgstr "ロックする (不慮の登録解除を予防)" -#: ../src/dockedapp.c:319 +#: ../src/dockedapp.c:345 msgid "Application path and arguments" msgstr "アプリケーションのパスと引数" -#: ../src/dockedapp.c:330 +#: ../src/dockedapp.c:358 +msgid "Command for middle-click launch" +msgstr "中ボタンクリックで起動されるコマンド" + +#: ../src/dockedapp.c:372 +#, c-format +msgid "%s will be replaced with current selection" +msgstr "%s は セレクションに置き換えられます" + +#: ../src/dockedapp.c:377 msgid "Command for files dropped with DND" -msgstr "DNDによるファイルドロップ時のコマンド" +msgstr "DND で落とされたファイル用のコマンド" -#: ../src/dockedapp.c:342 +#: ../src/dockedapp.c:391 #, c-format msgid "%d will be replaced with the file name" -msgstr "%dはそのファイル名に置き換えられます" +msgstr "%d は ファイル名に置き換えられます" -#: ../src/dockedapp.c:346 +#: ../src/dockedapp.c:395 msgid "DND support was not compiled in" msgstr "DND対応でコンパイルされていません" -#: ../src/dockedapp.c:352 +#: ../src/dockedapp.c:400 msgid "Icon Image" msgstr "アイコン画像" -#: ../src/dockedapp.c:364 ../src/winspector.c:1533 +#: ../src/dockedapp.c:414 ../src/winspector.c:1521 msgid "Browse..." msgstr "参照..." -#: ../src/dockedapp.c:409 +#: ../src/dockedapp.c:475 msgid "Docked Application Settings" msgstr "ドックの登録アプリケーション設定" -#: ../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 "テクスチャをレンダリングできません: %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 "画像のレンダリングエラー:%s" +msgstr "画像のレンダリングエラー: %s" -#: ../src/framewin.c:777 +#: ../src/framewin.c:775 #, c-format msgid "error rendering image: %s" msgstr "画像のレンダリングエラー: %s" -#: ../src/icon.c:229 ../src/wdefaults.c:440 +#: ../src/icon.c:239 ../src/wdefaults.c:443 #, c-format msgid "error loading image file \"%s\"" msgstr "画像ファイル\"%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 "ディレクトリ%sを作成できません" -#: ../src/icon.c:767 +#: ../src/icon.c:782 #, c-format msgid "could not find default icon \"%s\"" msgstr "標準アイコン\"%s\"が見つかりません" -#: ../src/icon.c:773 +#: ../src/icon.c:788 #, c-format msgid "could not load default icon \"%s\":%s" -msgstr "標準アイコン\"%s\"をロードできません: %s" +msgstr "標準アイコン\"%s\"をロードできません:%s" -#: ../src/main.c:205 +#: ../src/main.c:220 msgid "failed to restart Window Maker." msgstr "Window Maker の再起動に失敗しました" -#: ../src/main.c:208 +#: ../src/main.c:223 #, c-format msgid "could not exec %s" msgstr "%s を実行できません" -#: ../src/main.c:254 +#: ../src/main.c:269 msgid "Could not execute command: " msgstr "コマンドを実行できません: " -#: ../src/main.c:411 +#: ../src/main.c:426 #, c-format msgid "%s aborted.\n" msgstr "%sは中断しました\n" -#: ../src/main.c:422 +#: ../src/main.c:437 #, c-format msgid "Usage: %s [options]\n" -msgstr "使用法: %s [-オプション]\n" +msgstr "使用法: %s [オプション]\n" -#: ../src/main.c:423 +#: ../src/main.c:438 msgid "The Window Maker window manager for the X window system" msgstr "Window Maker -- X ウィンドウシステムのためのウィンドウマネージャ" -#: ../src/main.c:425 +#: ../src/main.c:440 msgid " -display host:dpy\tdisplay to use" -msgstr " -display ホスト:ID番号\tディスプレイの指定" +msgstr "-display ホスト:ID番号\tディスプレイの指定" -#: ../src/main.c:427 +#: ../src/main.c:442 msgid " --no-cpp \t\tdisable preprocessing of configuration files" msgstr " --no-cpp \t\t設定ファイルをプリプロセッサにかけない" -#: ../src/main.c:429 +#: ../src/main.c:444 msgid " --no-dock\t\tdo not open the application Dock" msgstr " --no-dock\t\tアプリケーション・ドックを開かない" -#: ../src/main.c:430 +#: ../src/main.c:445 msgid " --no-clip\t\tdo not open the workspace Clip" msgstr " --no-clip\t\tアプリケーション・クリップ(Clip)を開かない" -#: ../src/main.c:431 +#: ../src/main.c:446 msgid " --no-autolaunch\tdo not autolaunch applications" msgstr " --no-autolaunch\tアプリケーションの自動起動を行わない" -#: ../src/main.c:432 +#: ../src/main.c:447 msgid " --dont-restore\t\tdo not restore saved session" msgstr " --dont-restore\t\t保存したセッションを復元しない" -#: ../src/main.c:434 +#: ../src/main.c:449 msgid " --locale locale\tlocale to use" msgstr " --locale locale\t使用するlocaleの指定" -#: ../src/main.c:436 +#: ../src/main.c:451 msgid "" " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals" msgstr " --create-stdcmap\t擬似色解像度に標準カラーマップヒントを作成する" -#: ../src/main.c:437 +#: ../src/main.c:452 msgid " --visual-id visualid\tvisual id of visual to use" msgstr " --visual-id ビジュアルID\tビジュアルIDの指定" -#: ../src/main.c:438 +#: ../src/main.c:453 msgid " --static\t\tdo not update or save configurations" msgstr " --static\t\tスタティックモードで起動(設定を保存／更新しない)" -#: ../src/main.c:439 +#: ../src/main.c:454 msgid " --no-polling\t\tdo not periodically check for configuration updates" msgstr " --no-polling\t\t周期的に設定ファイルの更新をチェックしない" -#: ../src/main.c:441 +#: ../src/main.c:456 msgid " --synchronous\t\tturn on synchronous display mode" msgstr " --synchronous\t\t画面の同期モードを on にする" -#: ../src/main.c:443 +#: ../src/main.c:458 msgid " --version\t\tprint version and exit" msgstr " --version\t\tバージョンを表示してすぐ終了する" -#: ../src/main.c:444 +#: ../src/main.c:459 msgid " --help\t\t\tshow this message" msgstr " --help\t\tこのメッセージを表示" -#: ../src/main.c:456 +#: ../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ディレクトリ(%s)が見つかりません\n" -"Window Makerが正しくインストールされていることを確認して, " -"wmaker.instを実行してください" +"Window Makerが正しくインストールされていることを確認して, wmaker.instを実行し" +"てください" + +#: ../src/main.c:478 +#, c-format +msgid "could not find user GNUstep directory (%s)." +msgstr "ユーザのGNUstepディレクトリ(%s)が見つかりません" + +#: ../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 "" +"ユーザのGNUstepディレクトリの作成に失敗しました,\n" +"Window Makerが正しくインストールされていることを確認して, wmaker.instを実行し" +"てください" + +#: ../src/main.c:484 +#, c-format +msgid "%s directory created with default configuration." +msgstr "デフォルト設定で %s ディレクトリが作成されました" -#: ../src/main.c:477 ../src/main.c:482 +#: ../src/main.c:506 ../src/main.c:511 #, c-format msgid "%s:could not execute initialization script" msgstr "%s:初期化スクリプトを実行できません" -#: ../src/main.c:502 ../src/main.c:507 +#: ../src/main.c:533 ../src/main.c:538 #, c-format msgid "%s:could not execute exit script" msgstr "%s:終了スクリプトを実行できません" -#: ../src/main.c:623 ../src/main.c:631 ../src/main.c:639 ../src/main.c:659 +#: ../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 "%sに対する引数が足りません" -#: ../src/main.c:643 +#: ../src/main.c:742 #, c-format msgid "bad value for visualid: \"%s\"" msgstr "ビジュアルIDの値が不正です: \"%s\"" -#: ../src/main.c:667 +#: ../src/main.c:766 #, c-format msgid "%s: invalid argument '%s'\n" msgstr "%s: 無効な引数です '%s'\n" -#: ../src/main.c:668 +#: ../src/main.c:767 #, c-format msgid "Try '%s --help' for more information\n" msgstr "追加情報のために '%s --help' を試してみてください\n" -#: ../src/main.c:699 +#: ../src/main.c:802 msgid "X server does not support locale" msgstr "Xサーバがロケール機能をサポートしていません" -#: ../src/main.c:703 +#: ../src/main.c:806 msgid "cannot set locale modifiers" msgstr "ロケールを設定できません" -#: ../src/main.c:719 +#: ../src/main.c:822 #, c-format msgid "could not open display \"%s\"" msgstr "ディスプレイ`%s'を開けません" -#: ../src/menu.c:1255 +#: ../src/menu.c:1273 msgid "could not grab keyboard" msgstr "キーボードを確保できません" -#: ../src/misc.c:71 +#: ../src/menu.c:2612 +#, c-format +msgid "bad value in menus state info:%s" +msgstr "メニューの情報 %s に不正な内容があります" + +#: ../src/misc.c:65 #, c-format msgid "could not define value for %s for cpp" msgstr "cppの %sの値を定義できません" -#: ../src/misc.c:101 +#: ../src/misc.c:95 #, c-format msgid "could not get password entry for UID %i" msgstr "ユーザID %i のパスワードエントリを得られません" -#: ../src/misc.c:126 +#: ../src/misc.c:120 #, c-format msgid "your machine is misconfigured. HOSTNAME is set to %s" msgstr "あなたのマシンの設定がおかしいです. HOSTNAME が %s に設定されています" -#: ../src/misc.c:132 +#: ../src/misc.c:126 #, c-format msgid "your machine is misconfigured. HOST is set to %s" msgstr "あなたのマシンの設定がおかしいです. HOST が %s に設定されています" -#: ../src/misc.c:626 +#: ../src/misc.c:621 msgid "Program Arguments" msgstr "プログラム引数" -#: ../src/misc.c:627 +#: ../src/misc.c:622 msgid "Enter command arguments:" -msgstr "コマンドライン引数を入力してください" - -#: ../src/misc.c:720 -msgid "unable to get dropped data from DND drop" -msgstr "DNDドロップからドロップ情報を得られません" +msgstr "コマンドライン引数を入力してください:" -#: ../src/misc.c:728 -msgid "error getting dropped data from DND drop" -msgstr "DNDドロップからのドロップ情報取得に失敗しました" - -#: ../src/misc.c:734 -msgid "out of memory while getting data from DND drop" -msgstr "DNDドロップからドロップ情報を得るときにメモリが不足しました" - -#: ../src/misc.c:779 ../src/misc.c:919 +#: ../src/misc.c:736 ../src/misc.c:874 #, c-format msgid "out of memory during expansion of \"%s\"" msgstr "\"%s\"の展開中にメモリが不足しました" -#: ../src/misc.c:833 +#: ../src/misc.c:790 msgid "out of memory during expansion of \"%w\"" msgstr "\"%w\"の展開中にメモリが不足しました" -#: ../src/misc.c:851 +#: ../src/misc.c:808 msgid "out of memory during expansion of \"%W\"" msgstr "\"%W\"の展開中にメモリが不足しました" -#: ../src/misc.c:867 +#: ../src/misc.c:824 +#, c-format msgid "out of memory during expansion of \"%a\"" msgstr "\"%a\"の展開中にメモリが不足しました" -#: ../src/misc.c:898 +#: ../src/misc.c:853 #, c-format msgid "out of memory during expansion of \"%d\"" msgstr "\"%d\"の展開中にメモリが不足しました" -#: ../src/misc.c:912 +#: ../src/misc.c:867 msgid "selection not available" -msgstr "" +msgstr "セレクションが利用不能" -#: ../src/misc.c:985 ../src/misc.c:991 +#: ../src/misc.c:911 ../src/misc.c:917 #, c-format msgid "bad window name value in %s state info" msgstr "%sステート情報中に不正なウィンドウ名があります" -#: ../src/misc.c:1248 +#: ../src/misc.c:1156 msgid "could not send message to background image helper" msgstr "背景イメージヘルパーにメッセージを送信できません" @@ -982,67 +1066,6 @@ msgid "could not load mask bitmap file \"%s\". Won't use mask" msgstr "マスクビットマップファイル\"%s\"が読み込めません. マスクを使いません" -#: ../src/proplist.c:180 -msgid "unterminated string" -msgstr "文字列の終端がありません" - -#: ../src/proplist.c:247 -msgid "unterminated array" -msgstr "配列の終端がありません" - -#: ../src/proplist.c:256 -msgid "missing , in array or unterminated array" -msgstr "配列中で `,'が足りません" - -#: ../src/proplist.c:267 -msgid "could not get array element" -msgstr "配列要素を得ることができません" - -#: ../src/proplist.c:297 -msgid "unterminated dictionary" -msgstr "辞書の終端がありません" - -#: ../src/proplist.c:315 -msgid "missing dictionary key" -msgstr "辞書キーがありません" - -#: ../src/proplist.c:317 -msgid "missing dictionary entry key or unterminated dictionary" -msgstr "辞書キーがないか, 辞書の終端がありません" - -#: ../src/proplist.c:323 -msgid "error parsing dictionary key" -msgstr "辞書キーの解読中にエラーが発生しました" - -#: ../src/proplist.c:332 -msgid "missing = in dictionary entry" -msgstr "辞書エントリに `='がありません" - -#: ../src/proplist.c:351 -msgid "missing ; in dictionary entry" -msgstr "辞書エントリに `;'が足りません" - -#: ../src/proplist.c:432 -msgid "" -"was expecting a string, dictionary, data or array. If it's a string, try " -"enclosing it with \"." -msgstr "" -"には, 文字列, 辞書, データもしくは配列を続けてください. 文字列の場合, \" " -"でくくることも試して下さい. " - -#: ../src/proplist.c:434 -msgid "Comments are not allowed inside WindowMaker owned domain files." -msgstr "WindowMaker自身の内部ドメインファイル中ではコメントは書けません" - -#: ../src/proplist.c:453 -#, c-format -msgid "could not open domain file %s" -msgstr "ドメインファイル%sを開けません" - -#: ../src/proplist.c:466 -msgid "extra data after end of file" -msgstr "ファイル終端に余分なデータがあります" - #: ../src/resources.c:44 #, c-format msgid "could not parse color \"%s\"" @@ -1053,19 +1076,19 @@ msgid "could not allocate color \"%s\"" msgstr "カラー\"%s\"を予約できません" -#: ../src/rootmenu.c:183 ../src/rootmenu.c:185 +#: ../src/rootmenu.c:196 ../src/rootmenu.c:198 msgid "Exit" msgstr "終了" -#: ../src/rootmenu.c:184 +#: ../src/rootmenu.c:197 msgid "Exit window manager?" msgstr "ウィンドウマネージャを終了しますか?" -#: ../src/rootmenu.c:220 +#: ../src/rootmenu.c:245 msgid "Close X session" msgstr "Xセッションの終了" -#: ../src/rootmenu.c:221 +#: ../src/rootmenu.c:246 msgid "" "Close Window System session?\n" "Kill might close applications with unsaved data." @@ -1077,15 +1100,15 @@ #. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); #. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); #. -#: ../src/rootmenu.c:223 ../src/winmenu.c:505 +#: ../src/rootmenu.c:248 ../src/winmenu.c:501 msgid "Close" msgstr "閉じる" -#: ../src/rootmenu.c:234 +#: ../src/rootmenu.c:261 msgid "Kill X session" msgstr "Xセッションの終了" -#: ../src/rootmenu.c:235 +#: ../src/rootmenu.c:262 msgid "" "Kill Window System session?\n" "(all applications will be closed)" @@ -1093,202 +1116,202 @@ "ウィンドウシステムのセッションを終了しますか?\n" "(全てのアプリケーションが閉じられます)" -#: ../src/rootmenu.c:504 +#: ../src/rootmenu.c:544 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" msgstr "%s:キーボードショートカットの設定\"%s\"が間違っています(%s)" -#: ../src/rootmenu.c:512 +#: ../src/rootmenu.c:552 #, c-format msgid "%s:invalid key in shortcut \"%s\" for entry %s" msgstr "%s:キーボードショートカット\"%s\"が間違っています(%s)" -#: ../src/rootmenu.c:565 +#: ../src/rootmenu.c:605 #, c-format msgid "%s: unmatched '\"' in menu file" msgstr "%s: メニューファイル中, '\"'が対応していません" -#: ../src/rootmenu.c:615 +#: ../src/rootmenu.c:655 #, c-format msgid "%s: missing command" msgstr "%s: コマンドの指定がありません" -#: ../src/rootmenu.c:647 +#: ../src/rootmenu.c:687 #, c-format msgid "invalid OPEN_MENU specification: %s" msgstr "OPEN_MENUの指定が不適切です: %s" -#: ../src/rootmenu.c:695 +#: ../src/rootmenu.c:738 #, c-format msgid "%s:could not stat menu" msgstr "%s:メニューをstatできません" -#: ../src/rootmenu.c:703 +#: ../src/rootmenu.c:746 #, c-format msgid "%s:could not stat menu:%s" msgstr "%s:メニューをstatできません: %s" -#: ../src/rootmenu.c:721 +#: ../src/rootmenu.c:764 #, c-format msgid "too many parameters in OPEN_MENU: %s" msgstr "OPEN_MENUのパラメータが多すぎます: %s" -#: ../src/rootmenu.c:765 +#: ../src/rootmenu.c:808 msgid "" "There are more than one WORKSPACE_MENU commands in the applications menu. " "Only one is allowed." msgstr "" -"アプリケーションメニュー中, WORKSPACE_MENUコマンドが複数存在します. " -"一つのみ可能です" +"アプリケーションメニュー中, WORKSPACE_MENUコマンドが複数存在します. 一つのみ" +"可能です" -#: ../src/rootmenu.c:799 +#: ../src/rootmenu.c:842 msgid "" "There are more than one WINDOWS_MENU commands in the applications menu. Only " "one is allowed." msgstr "" -"アプリケーションメニュー中, WINDOWS_MENUコマンドが複数存在します. " -"一つのみ可能です" +"アプリケーションメニュー中, WINDOWS_MENUコマンドが複数存在します. 一つのみ可" +"能です" -#: ../src/rootmenu.c:804 +#: ../src/rootmenu.c:847 msgid "Window List" msgstr "ウィンドウ一覧" -#: ../src/rootmenu.c:833 ../src/rootmenu.c:851 ../src/rootmenu.c:861 +#: ../src/rootmenu.c:876 ../src/rootmenu.c:894 ../src/rootmenu.c:904 #, c-format msgid "%s:missing parameter for menu command \"%s\"" msgstr "%s:メニューコマンド\"%s\"に対するパラメータがありません" -#: ../src/rootmenu.c:929 +#: ../src/rootmenu.c:972 #, c-format msgid "%s:unknown command \"%s\" in menu config." msgstr "%s:メニュー設定中, 不正なコマンド\"%s\"があります" -#: ../src/rootmenu.c:937 +#: ../src/rootmenu.c:980 #, c-format msgid "%s:can't add shortcut for entry \"%s\"" msgstr "%s:エントリ\"%s\"のショートカットを登録できません" -#: ../src/rootmenu.c:1074 +#: ../src/rootmenu.c:1117 #, c-format msgid "%s:maximal line size exceeded in menu config: %s" msgstr "%s:メニュー設定の最大行数を越えました: %s" -#: ../src/rootmenu.c:1096 ../src/rootmenu.c:1189 ../src/rootmenu.c:1291 +#: ../src/rootmenu.c:1139 ../src/rootmenu.c:1232 ../src/rootmenu.c:1336 #, c-format msgid "%s:missing command in menu config: %s" -msgstr "%s:メニュー設定に, コマンドがありません: %s" +msgstr "%s:メニュー設定にコマンドの指定がありません: %s" -#: ../src/rootmenu.c:1126 +#: ../src/rootmenu.c:1169 #, c-format msgid "%s:syntax error in menu file:END declaration missing" msgstr "%s:メニューファイルに文法エラーがあります: END の記述が足りません" -#: ../src/rootmenu.c:1155 ../src/rootmenu.c:1255 +#: ../src/rootmenu.c:1198 ../src/rootmenu.c:1300 msgid "could not make arguments for menu file preprocessor" msgstr "メニューファイル・プリプロセッサへの引数が作成できません" -#: ../src/rootmenu.c:1162 ../src/rootmenu.c:1263 +#: ../src/rootmenu.c:1205 ../src/rootmenu.c:1308 #, c-format msgid "%s:could not open/preprocess menu file" msgstr "%s:メニューファイルのオープン／プリプロセスができません" -#: ../src/rootmenu.c:1174 ../src/rootmenu.c:1276 +#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321 #, c-format msgid "%s:could not open menu file" msgstr "%s:メニューファイルを開けません" -#: ../src/rootmenu.c:1201 +#: ../src/rootmenu.c:1244 #, c-format msgid "%s:invalid menu file. MENU command is missing" msgstr "%s: メニューファイルが不適当です. MENUコマンドが存在しません" -#: ../src/rootmenu.c:1210 +#: ../src/rootmenu.c:1253 msgid "error reading preprocessed menu data" msgstr "プリプロセスされたメニューデータの読み込みにエラーが起きました" -#: ../src/rootmenu.c:1303 +#: ../src/rootmenu.c:1348 #, c-format msgid "%s:no title given for the root menu" msgstr "%s:ルートメニューのタイトルがありません" -#: ../src/rootmenu.c:1394 ../src/rootmenu.c:1467 ../src/rootmenu.c:1508 +#: ../src/rootmenu.c:1439 ../src/rootmenu.c:1512 ../src/rootmenu.c:1553 #, c-format msgid "out of memory while constructing directory menu %s" -msgstr "ディレクトリメニュー%sの作成ためのメモリが不足してます" +msgstr "ディレクトリメニュー%sの作成のためのメモリが不足しています" -#: ../src/rootmenu.c:1404 +#: ../src/rootmenu.c:1449 #, c-format msgid "%s:could not stat file \"%s\" in menu directory" msgstr "%s:メニューディレクトリのファイル\"%s\"をstatできません" -#: ../src/rootmenu.c:1562 +#: ../src/rootmenu.c:1607 msgid "Commands" msgstr "コマンド" -#: ../src/rootmenu.c:1565 +#: ../src/rootmenu.c:1610 msgid "Restart" msgstr "再起動" -#: ../src/rootmenu.c:1566 +#: ../src/rootmenu.c:1611 msgid "Exit..." msgstr "終了..." -#: ../src/rootmenu.c:1611 +#: ../src/rootmenu.c:1656 #, c-format msgid "could not find menu file \"%s\" referenced in WMRootMenu" msgstr "WMRootMenuで参照しているメニュー\"%s\"を見つけられません" -#: ../src/rootmenu.c:1618 +#: ../src/rootmenu.c:1663 #, c-format msgid "could not access menu \"%s\" referenced in WMRootMenu" msgstr "WMRootMenuで参照しているメニュー\"%s\"へアクセスできません" -#: ../src/rootmenu.c:1629 +#: ../src/rootmenu.c:1674 #, c-format msgid "" "using default menu file \"%s\" as the menu referenced in WMRootMenu could " "not be found " msgstr "" -"WMRootMenuで参照しているメニュー見つからないので, " -"デフォルトのメニューファイル \"%s\" を用います" +"WMRootMenuで参照しているメニュー見つからないので, デフォルトのメニューファイ" +"ル \"%s\" を用います" -#: ../src/rootmenu.c:1652 ../src/rootmenu.c:1728 +#: ../src/rootmenu.c:1697 ../src/rootmenu.c:1773 #, c-format msgid "%s:format error in root menu configuration \"%s\"" msgstr "%s:ルートメニュー設定\"%s\"にフォーマットエラーがあります" -#: ../src/rootmenu.c:1816 +#: ../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 "" -"アプリケーションメニューがロードできません. " -"エラーの詳細はコンソールへの出力を参照してください" +"アプリケーションメニューがロードできません. エラーの詳細はコンソールへの出力" +"を参照してください" -#: ../src/screen.c:740 +#: ../src/screen.c:709 #, c-format msgid "could not initialize graphics library context: %s" msgstr "グラフィックライブラリコンテキストを初期化できません: %s" -#: ../src/screen.c:771 -msgid "could not do initialization of WINGs widget set" +#: ../src/screen.c:737 +msgid "could not initialize WINGs widget set" msgstr "WINGsウィジェットセットの初期化ができません" -#: ../src/screen.c:1135 +#: ../src/screen.c:1144 #, c-format msgid "could not save session state in %s" msgstr "%sのセッションを保存できませんでした" -#: ../src/session.c:183 ../src/wdefaults.c:588 ../src/winspector.c:453 +#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:459 #, c-format msgid "can't convert \"%s\" to boolean" msgstr "\"%s\"を boolean型に変換できません" -#: ../src/session.c:1021 +#: ../src/session.c:1018 msgid "out of memory while saving session state" msgstr "セッションの状態を保存している途中にメモリが足りなくなりました" -#: ../src/session.c:1112 +#: ../src/session.c:1101 msgid "end of memory while saving session state" msgstr "セッションの状態を保存している途中にメモリがなくなりました" @@ -1298,109 +1321,43 @@ #. * If the sm was the last client of session, then we'll die #. * anyway, otherwise we can continue doing our stuff. #. -#: ../src/session.c:1250 +#: ../src/session.c:1239 msgid "connection to the session manager was lost" msgstr "セッション・マネージャとの接続が失われました" -#: ../src/stacking.c:73 +#: ../src/stacking.c:81 msgid "could not get window list!!" msgstr "ウィンドウ一覧が得られません!!" -#: ../src/startup.c:202 +#: ../src/startup.c:195 #, c-format msgid "internal X error: %s\n" msgstr "X内部エラー: %s\n" -#: ../src/startup.c:260 -#, c-format -msgid "got signal %i (%s) - restarting\n" -msgstr "シグナル%i(%s)を受けました -- 再起動します\n" - -#: ../src/startup.c:262 -#, c-format -msgid "got signal %i - restarting\n" -msgstr "シグナル%iを受けました -- 再起動します\n" - -#: ../src/startup.c:272 -#, c-format -msgid "got signal %i (%s) - rereading defaults\n" -msgstr "シグナル%i(%s)を受けました -- デフォルトを再読み込みします\n" - -#: ../src/startup.c:274 -#, c-format -msgid "got signal %i - rereading defaults\n" -msgstr "シグナル%iを受けました -- デフォルトを再読み込みします\n" - -#: ../src/startup.c:284 -#, c-format -msgid "got signal %i (%s) - exiting...\n" -msgstr "シグナル%i(%s)を受けました -- 終了します...\n" - -#: ../src/startup.c:286 -#, c-format -msgid "got signal %i - exiting...\n" -msgstr "シグナル%iを受けました -- 終了します...\n" - -#: ../src/startup.c:322 -#, c-format -msgid "got signal %i (%s)\n" -msgstr "シグナル%i(%s)を受けました\n" - -#: ../src/startup.c:324 -#, c-format -msgid "got signal %i\n" -msgstr "シグナル%iを受けました\n" - -#: ../src/startup.c:335 -msgid "" -"crashed while trying to do some post-crash cleanup. Aborting immediatelly." -msgstr "クラッシュ後の浄化処理中にクラッシュしました. 直ちに中断します" - -#. we try to restart Window Maker -#: ../src/startup.c:400 -msgid "trying to restart Window Maker..." -msgstr "Window Maker を再起動しています..." - -#: ../src/startup.c:405 -msgid "trying to start alternate window manager..." -msgstr "かわりのウィンドウマネージャを起動しています..." - -#: ../src/startup.c:410 -msgid "failed to start alternate window manager. Aborting." -msgstr "かわりのウィンドウマネージャを起動に失敗しました. 中断します." - -#: ../src/startup.c:412 -msgid "" -"a fatal error has occured, probably due to a bug. Please fill the included " -"BUGFORM and report it." -msgstr "" -"バグによるものと思われる致命的なエラーが起きました. " -"バグフォームにしたがってレポートして下さい" - -#: ../src/startup.c:900 +#: ../src/startup.c:772 #, c-format msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" msgstr "" "設定されているアイコンサイズ%iは小さすぎます. かわりにサイズ16を用います\n" -#: ../src/startup.c:928 +#: ../src/startup.c:801 msgid "XKB is not supported. KbdModeLock is automatically disabled." msgstr "XKB はサポートされていません. KbdModeLock は自動的に無効になります" -#: ../src/startup.c:947 +#: ../src/startup.c:820 msgid "it seems that there is already a window manager running" msgstr "既に他のウィンドウマネージャが立ち上がっているようです" -#: ../src/startup.c:953 +#: ../src/startup.c:826 #, c-format msgid "could not manage screen %i" msgstr "スクリーン %iを掌握できません" -#: ../src/startup.c:1021 +#: ../src/startup.c:885 msgid "could not manage any screen" msgstr "掌握できるスクリーンがありません" -#: ../src/switchmenu.c:114 +#: ../src/switchmenu.c:145 msgid "Windows" msgstr "ウィンドウ一覧" @@ -1432,20 +1389,20 @@ msgid "could not allocate image buffer" msgstr "画像バッファを予約できません" -#: ../src/wdefaults.c:434 +#: ../src/wdefaults.c:437 #, c-format msgid "could not find icon file \"%s\"" msgstr "アイコンファイル \"%s\"が見つかりません" -#: ../src/window.c:2825 ../src/window.c:2960 +#: ../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 "" -"NumLock, ScrollLock 等のキーがONになってます\n" +"NumLock, ScrollLock 等のキーがONになってませんかね.\n" "マウス機能やキーボードショートカットを正常に利用するにはOFFに切替えて下さい" -#: ../src/winmenu.c:129 +#: ../src/winmenu.c:125 msgid "" "This will kill the application.\n" "Any unsaved changes will be lost.\n" @@ -1455,19 +1412,19 @@ "保存されていない変更は全て失われます\n" "終了させますか？" -#: ../src/winmenu.c:271 ../src/winmenu.c:280 +#: ../src/winmenu.c:268 ../src/winmenu.c:277 msgid "Set Shortcut" msgstr "ショートカット設定" -#: ../src/winmenu.c:358 ../src/winmenu.c:403 +#: ../src/winmenu.c:355 ../src/winmenu.c:400 msgid "could not create submenu for window menu" msgstr "サブメニューを作れません" -#: ../src/winmenu.c:407 +#: ../src/winmenu.c:404 msgid "Keep on top" msgstr "常に一番上に表示" -#: ../src/winmenu.c:412 +#: ../src/winmenu.c:409 msgid "Keep at bottom" msgstr "常に一番下に表示" @@ -1476,71 +1433,70 @@ #. * entries, you must update the command #defines in the top of #. * this file. #. -#: ../src/winmenu.c:440 ../src/winmenu.c:575 +#: ../src/winmenu.c:437 ../src/winmenu.c:571 msgid "Maximize" msgstr "最大化" -#: ../src/winmenu.c:448 ../src/winmenu.c:561 +#: ../src/winmenu.c:445 ../src/winmenu.c:557 msgid "Miniaturize" msgstr "最小化" -#: ../src/winmenu.c:457 ../src/winmenu.c:592 +#: ../src/winmenu.c:453 ../src/winmenu.c:588 msgid "Shade" msgstr "シェード" -#: ../src/winmenu.c:473 +#: ../src/winmenu.c:469 msgid "Resize/Move" msgstr "サイズ変更/移動" -#: ../src/winmenu.c:481 +#: ../src/winmenu.c:477 msgid "Select" msgstr "選択" -#: ../src/winmenu.c:489 +#: ../src/winmenu.c:485 msgid "Move To" msgstr "移動" -#: ../src/winmenu.c:494 +#: ../src/winmenu.c:490 msgid "Attributes..." msgstr "属性..." -#: ../src/winmenu.c:496 +#: ../src/winmenu.c:492 msgid "Options" msgstr "オプション" -#: ../src/winmenu.c:556 +#: ../src/winmenu.c:552 msgid "Deminiaturize" msgstr "最小化解除" -#: ../src/winmenu.c:570 +#: ../src/winmenu.c:566 msgid "Unmaximize" msgstr "最大化解除" -#: ../src/winmenu.c:587 +#: ../src/winmenu.c:583 msgid "Unshade" msgstr "シェード解除" -#: ../src/winspector.c:386 +#: ../src/winspector.c:392 #, c-format msgid "Could not find icon \"%s\" specified for this window" msgstr "このウィンドウへ指定されたアイコン\"%s\"が見つかりません" -#: ../src/winspector.c:403 +#: ../src/winspector.c:409 #, c-format msgid "Could not open specified icon \"%s\":%s" msgstr "指定されたアイコン\"%s\"が開けません:%s" -#: ../src/winspector.c:1141 +#: ../src/winspector.c:1129 #, c-format msgid "Inspecting %s.%s" msgstr "属性 ( %s.%s )" -# msgstr "調査 ( %s.%s )" -#: ../src/winspector.c:1167 +#: ../src/winspector.c:1155 msgid "Click in the window you wish to inspect." msgstr "調査対象のウィンドウをクリックしてください." -#: ../src/winspector.c:1206 +#: ../src/winspector.c:1194 msgid "" "The configuration will apply to all\n" "windows that have their WM_CLASS\n" @@ -1551,55 +1507,55 @@ "指定されたWM_CLASSプロパティを\n" "持つ全てのウィンドウに適用されます" -#: ../src/winspector.c:1235 +#: ../src/winspector.c:1223 msgid "Save" msgstr "保存" -#: ../src/winspector.c:1243 +#: ../src/winspector.c:1231 msgid "Apply" msgstr "適用" -#: ../src/winspector.c:1249 +#: ../src/winspector.c:1237 msgid "Reload" msgstr "再読み込み" -#: ../src/winspector.c:1258 ../src/winspector.c:1268 +#: ../src/winspector.c:1246 ../src/winspector.c:1256 msgid "Window Specification" msgstr "ウィンドウの指定" -#: ../src/winspector.c:1259 +#: ../src/winspector.c:1247 msgid "Window Attributes" msgstr "ウィンドウの属性" -#: ../src/winspector.c:1260 +#: ../src/winspector.c:1248 msgid "Advanced Options" -msgstr "アドバンスト・オプション" +msgstr "こだわりの設定" -#: ../src/winspector.c:1261 +#: ../src/winspector.c:1249 msgid "Icon and Initial Workspace" msgstr "アイコンとワークスペース" -#: ../src/winspector.c:1262 +#: ../src/winspector.c:1250 msgid "Application Specific" msgstr "アプリケーション固有の設定" -#: ../src/winspector.c:1276 +#: ../src/winspector.c:1264 msgid "Defaults for all windows" msgstr "全ウィンドウの標準" -#: ../src/winspector.c:1330 +#: ../src/winspector.c:1318 msgid "Select window" msgstr "ウィンドウの選択" -#: ../src/winspector.c:1344 +#: ../src/winspector.c:1332 msgid "Attributes" msgstr "属性" -#: ../src/winspector.c:1355 +#: ../src/winspector.c:1343 msgid "Disable titlebar" msgstr "タイトルバーを表示しない" -#: ../src/winspector.c:1357 +#: ../src/winspector.c:1345 msgid "" "Remove the titlebar of this window.\n" "To access the window commands menu of a window\n" @@ -1609,88 +1565,88 @@ msgstr "" "このウィンドウのタイトルバーを表示しなくします.\n" "タイトルバーのないウィンドウのメニューを表示するには, \n" -"コントロールキー と エスケープキーを同時に押します.\n" -"(または, それに相当するあなたが設定したショートカットキー)" +"コントロールキー と エスケープキーを同時に押します\n" +"(または, それに相当するあなたが設定したショートカットキー)." -#: ../src/winspector.c:1364 +#: ../src/winspector.c:1352 msgid "Disable resizebar" msgstr "リサイズバーを表示しない" -#: ../src/winspector.c:1366 +#: ../src/winspector.c:1354 msgid "Remove the resizebar of this window." msgstr "このウィンドウのリサイズバーを表示しなくします" -#: ../src/winspector.c:1369 +#: ../src/winspector.c:1357 msgid "Disable close button" msgstr "クローズボタンを表示しない" -#: ../src/winspector.c:1371 +#: ../src/winspector.c:1359 msgid "Remove the `close window' button of this window." msgstr "このウィンドウのクローズボタンを表示しなくします" -#: ../src/winspector.c:1374 +#: ../src/winspector.c:1362 msgid "Disable miniaturize button" msgstr "最小化ボタンを表示しない" -#: ../src/winspector.c:1376 +#: ../src/winspector.c:1364 msgid "Remove the `miniaturize window' button of the window." msgstr "ウィンドウの最小化ボタンを表示しなくします" -#: ../src/winspector.c:1379 +#: ../src/winspector.c:1367 msgid "Disable border" -msgstr "ボーダーを表示しない" +msgstr "境界線を表示しない" -#: ../src/winspector.c:1381 +#: ../src/winspector.c:1369 msgid "Remove the 1 pixel black border around the window." msgstr "ウィンドウ周囲の 1ピクセルの境界を表示しなくします" -#: ../src/winspector.c:1384 +#: ../src/winspector.c:1372 msgid "Keep on top (floating)" msgstr "常に一番上に表示" -#: ../src/winspector.c:1386 +#: ../src/winspector.c:1374 msgid "" "Keep the window over other windows, not allowing\n" "them to cover it." msgstr "常に一番上に(浮いて)表示されます." -#: ../src/winspector.c:1390 +#: ../src/winspector.c:1378 msgid "Keep at bottom (sunken)" msgstr "常に一番下に表示" -#: ../src/winspector.c:1392 +#: ../src/winspector.c:1380 msgid "Keep the window under all other windows." msgstr "常に一番下に(沈んで)表示されます." -#: ../src/winspector.c:1397 +#: ../src/winspector.c:1385 msgid "Make window present in all workspaces." msgstr "全てのワークスペースで表示します." -#: ../src/winspector.c:1400 +#: ../src/winspector.c:1388 msgid "Start miniaturized" msgstr "最小化状態で起動する" -#: ../src/winspector.c:1402 +#: ../src/winspector.c:1390 msgid "" "Make the window be automatically miniaturized when it's\n" "first shown." msgstr "最初に起動された時に自動的に最小化するようにします." -#: ../src/winspector.c:1406 +#: ../src/winspector.c:1394 msgid "Start maximized" msgstr "最大化状態で起動する" -#: ../src/winspector.c:1408 +#: ../src/winspector.c:1396 msgid "" "Make the window be automatically maximized when it's\n" "first shown." msgstr "最初に起動された時に自動的に最大化するようにします." -#: ../src/winspector.c:1412 +#: ../src/winspector.c:1400 msgid "Full screen maximization" msgstr "全画面最大化" -#: ../src/winspector.c:1414 +#: ../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" @@ -1699,15 +1655,15 @@ "最大化した時に全画面を使用するようにします. \n" "タイトルバーとリサイズバーは画面の外にはみ出します." -#: ../src/winspector.c:1431 +#: ../src/winspector.c:1419 msgid "Advanced" -msgstr "アドバンスト" +msgstr "上級設定" -#: ../src/winspector.c:1448 +#: ../src/winspector.c:1436 msgid "Do not bind keyboard shortcuts" msgstr "キーボードと連動しない" -#: ../src/winspector.c:1450 +#: ../src/winspector.c:1438 msgid "" "Do not bind keyboard shortcuts from Window Maker\n" "when this window is focused. This will allow the\n" @@ -1719,11 +1675,11 @@ "あなたの設定したショートカットも影響しないので, \n" "全てのキー操作をウィンドウに伝えることができます." -#: ../src/winspector.c:1456 +#: ../src/winspector.c:1444 msgid "Do not bind mouse clicks" msgstr "マウスクリックと連動しない" -#: ../src/winspector.c:1458 +#: ../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)." @@ -1731,19 +1687,19 @@ "ウィンドウ内でのマウスの動作(Alt+ドラッグなど)\n" "が影響しないようにします." -#: ../src/winspector.c:1463 +#: ../src/winspector.c:1451 msgid "Do not show in the window list" msgstr "ウィンドウ一覧に表示しない" -#: ../src/winspector.c:1465 +#: ../src/winspector.c:1453 msgid "Do not list the window in the window list menu." -msgstr "ウィンドウ一覧にウィンドウを候補表示しません" +msgstr "ウィンドウ一覧にこのウィンドウを候補表示しません" -#: ../src/winspector.c:1468 +#: ../src/winspector.c:1456 msgid "Do not let it take focus" msgstr "フォーカスしない" -#: ../src/winspector.c:1470 +#: ../src/winspector.c:1458 msgid "" "Do not let the window take keyboard focus when you\n" "click on it." @@ -1751,11 +1707,11 @@ "ウィンドウをクリックした時にもキーボードフォーカスを\n" "渡さないようにします" -#: ../src/winspector.c:1474 +#: ../src/winspector.c:1462 msgid "Keep inside screen" msgstr "スクリーンの内側に保持する" -#: ../src/winspector.c:1476 +#: ../src/winspector.c:1464 msgid "" "Do not allow the window to move itself completely\n" "outside the screen. For bug compatibility.\n" @@ -1763,21 +1719,21 @@ "ウィンドウが自身を完全に画面の外に移動させてしまわないようにします. \n" "(バグ互換性のため)\n" -#: ../src/winspector.c:1480 +#: ../src/winspector.c:1468 msgid "Ignore 'Hide Others'" msgstr "'他を隠す'を無視する" -#: ../src/winspector.c:1482 +#: ../src/winspector.c:1470 msgid "" "Do not hide the window when issuing the\n" "`HideOthers' command." msgstr "'他を隠す'コマンドが実行されても隠さないようにします" -#: ../src/winspector.c:1486 +#: ../src/winspector.c:1474 msgid "Ignore 'Save Session'" msgstr "'セッションの保存'を無視する" -#: ../src/winspector.c:1488 +#: ../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" @@ -1788,68 +1744,68 @@ "しないようにします. 次に Window Maker が起動した時に\n" "このアプリケーションが自動的に起動しないようになります." -#: ../src/winspector.c:1494 +#: ../src/winspector.c:1482 msgid "Emulate application icon" msgstr "アプリアイコンのエミュレート" -#: ../src/winspector.c:1496 +#: ../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 "" -"このウィンドウがドック可能なアプリアイコンを自前で備えている\n" -"かのように振る舞わせます." +"このウィンドウがドック可能なアプリアイコンを\n" +"自前で備えているかのように振る舞わせます." -#: ../src/winspector.c:1502 +#: ../src/winspector.c:1490 msgid "Disable language button" msgstr "言語の切り替えの無効化" -#: ../src/winspector.c:1504 +#: ../src/winspector.c:1492 msgid "Remove the `toggle language' button of the window." msgstr "'言語を切り替える'ボタンを表示しなくします" -#: ../src/winspector.c:1521 +#: ../src/winspector.c:1509 msgid "Miniwindow Image" msgstr "ミニウィンドウ画像" -#: ../src/winspector.c:1548 +#: ../src/winspector.c:1536 msgid "Icon filename:" msgstr "アイコンファイル名:" -#: ../src/winspector.c:1561 +#: ../src/winspector.c:1549 msgid "Ignore client supplied icon" -msgstr "アプリ指定のアイコンを無視" +msgstr "アプリ自前のアイコンを無視" -#: ../src/winspector.c:1568 +#: ../src/winspector.c:1556 msgid "Initial Workspace" msgstr "起動時のワークスペース" -#: ../src/winspector.c:1570 +#: ../src/winspector.c:1558 msgid "The workspace to place the window when it'sfirst shown." msgstr "このウィンドウが起動時に出現するワークスペース." -#: ../src/winspector.c:1576 +#: ../src/winspector.c:1564 msgid "Nowhere in particular" msgstr "特に指定しない" -#: ../src/winspector.c:1594 +#: ../src/winspector.c:1582 msgid "Application Attributes" msgstr "アプリケーション属性" -#: ../src/winspector.c:1605 +#: ../src/winspector.c:1593 msgid "Start hidden" msgstr "起動時に隠す" -#: ../src/winspector.c:1607 +#: ../src/winspector.c:1595 msgid "Automatically hide application when it's started." msgstr "アプリケーションの起動時に自動的に隠れるようにする" -#: ../src/winspector.c:1610 +#: ../src/winspector.c:1598 msgid "No application icon" msgstr "アプリアイコンを表示しない" -#: ../src/winspector.c:1612 +#: ../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" @@ -1860,38 +1816,35 @@ "注意: すると, ドックやクリップができなくなります. \n" "また, すでに登録されているドックも正しく動かなくなります." -#: ../src/winspector.c:1618 -msgid "Collapse application icons" -msgstr "アプリアイコンを折り畳む" +#: ../src/winspector.c:1606 +msgid "Shared application icon" +msgstr "アプリアイコンを共有" -#: ../src/winspector.c:1620 +#: ../src/winspector.c:1608 msgid "" -"Collapse application icons from other instances\n" -"of this application into one.\n" +"Use a single shared application icon for all of\n" +"the instances of this application.\n" msgstr "" "同じアプリが複数起動しているとき,\n" "アプリアイコンを１つにまとめます.\n" -#: ../src/workspace.c:110 ../src/workspace.c:111 ../src/workspace.c:897 +#: ../src/workspace.c:103 ../src/workspace.c:104 ../src/workspace.c:1302 #, c-format msgid "Workspace %i" msgstr "ワークスペース %i" -#: ../src/workspace.c:954 +#: ../src/workspace.c:1352 msgid "Workspaces" msgstr "ワークスペースの設定" -#: ../src/workspace.c:956 +#: ../src/workspace.c:1354 msgid "could not create Workspace menu" msgstr "ワークスペースメニューを作成できません" -#: ../src/workspace.c:963 +#: ../src/workspace.c:1361 msgid "New" msgstr "新しいワークスペースを作成" -#: ../src/workspace.c:964 +#: ../src/workspace.c:1362 msgid "Destroy Last" msgstr "最後のワークスペースを削除" - -#~ msgid "Sound" -#~ msgstr "サウンド" diff -Naur WindowMaker-0.91.0/po/Makefile.am wm/po/Makefile.am --- WindowMaker-0.91.0/po/Makefile.am 2004-10-26 07:17:12 +0400 +++ wm/po/Makefile.am 2004-10-27 00:03:06 +0400 @@ -48,7 +48,7 @@ WindowMaker.pot: $(POTFILES) xgettext --default-domain=WindowMaker \ - --add-comments --keyword=_ $(POTFILES) + --add-comments --keyword=_ --keyword=N_ $(POTFILES) if cmp -s WindowMaker.po WindowMaker.pot; then \ rm -f WindowMaker.po; \ else \ diff -Naur WindowMaker-0.91.0/po/Makefile.in wm/po/Makefile.in --- WindowMaker-0.91.0/po/Makefile.in 2004-10-26 08:10:45 +0400 +++ wm/po/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,264 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -nlsdir = $(NLSDIR) - -CATALOGS = @MOFILES@ - -CLEANFILES = $(CATALOGS) WindowMaker.pot - -# Please keep this sorted in alphabetic order! -EXTRA_DIST = be.po bg.po bs.po ca.po cs.po da.po de.po el.po es.po et.po fi.po fr.po gl.po hr.po hu.po it.po ja.po ko.po ms.po nl.po no.po pl.po pt.po ro.po ru.po sk.po sv.po tr.po zh_CN.po zh_TW.po - - -POTFILES = $(top_builddir)/src/appicon.c $(top_builddir)/src/application.c $(top_builddir)/src/defaults.c $(top_builddir)/src/dialog.c $(top_builddir)/src/dock.c $(top_builddir)/src/dockedapp.c $(top_builddir)/src/framewin.c $(top_builddir)/src/icon.c $(top_builddir)/src/main.c $(top_builddir)/src/menu.c $(top_builddir)/src/misc.c $(top_builddir)/src/pixmap.c $(top_builddir)/src/resources.c $(top_builddir)/src/rootmenu.c $(top_builddir)/src/screen.c $(top_builddir)/src/session.c $(top_builddir)/src/stacking.c $(top_builddir)/src/startup.c $(top_builddir)/src/switchmenu.c $(top_builddir)/src/switchpanel.c $(top_builddir)/src/texture.c $(top_builddir)/src/wdefaults.c $(top_builddir)/src/window.c $(top_builddir)/src/winmenu.c $(top_builddir)/src/winspector.c $(top_builddir)/src/wmspec.c $(top_builddir)/src/workspace.c - - -SUFFIXES = .po .mo -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../src/config.h -CONFIG_CLEAN_FILES = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -.SUFFIXES: .mo .po -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps po/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = po - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-data-local -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile all-local -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-local install-data-am install-data install-am install \ -uninstall-am uninstall all-local all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -.po.mo: - msgfmt -c -o $@ $< - -all-local: $(CATALOGS) - -WindowMaker.pot: $(POTFILES) - xgettext --default-domain=WindowMaker \ - --add-comments --keyword=_ $(POTFILES) - if cmp -s WindowMaker.po WindowMaker.pot; then \ - rm -f WindowMaker.po; \ - else \ - mv -f WindowMaker.po WindowMaker.pot; \ - fi - -install-data-local: $(CATALOGS) - $(mkinstalldirs) $(DESTDIR)$(nlsdir) - chmod 755 $(DESTDIR)$(nlsdir) - for n in $(CATALOGS) __DuMmY ; do \ - if test "$$n" -a "$$n" != "__DuMmY" ; then \ - l=`basename $$n .mo`; \ - $(mkinstalldirs) $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \ - chmod 755 $(DESTDIR)$(nlsdir)/$$l; \ - chmod 755 $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \ - $(INSTALL_DATA) -m 644 $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WindowMaker.mo; \ - fi; \ - done - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/po/zh_TW.po wm/po/zh_TW.po --- WindowMaker-0.91.0/po/zh_TW.po 2004-10-17 08:32:26 +0400 +++ wm/po/zh_TW.po 2005-01-21 07:05:48 +0300 @@ -1,38 +1,39 @@ -# Window Maker PO file for zh_TW.Big5 (Traditional Chinese). +# Window Maker PO file for Traditional Chinese. # Copyright (C) 1999-2001 Free Software Foundation, Inc. -# Li Wei Jih , 1999. +# Li Wei Jih , 1999, 2005. # Minor modifications by Anthony Fok , 2001. -# + msgid "" msgstr "" -"Project-Id-Version: Window Maker-0.51.0\n" -"POT-Creation-Date: 2001-05-10 18:28-0600\n" -"PO-Revision-Date: 1999-02-09 13:00+0800\n" +"Project-Id-Version: Window Maker-0.91.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-01-06 09:28+0800\n" +"PO-Revision-Date: 2005-01-11 17:45+0800\n" "Last-Translator: Li Wei Jih \n" "Language-Team: chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -#: ../src/appicon.c:550 ../src/dialog.c:224 ../src/dock.c:3293 -#: ../src/dockedapp.c:211 ../src/main.c:253 ../src/rootmenu.c:1765 -#: ../src/winspector.c:385 ../src/winspector.c:401 +#: ../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 "錯誤" -#: ../src/appicon.c:551 +#: ../src/appicon.c:416 msgid "Could not open specified icon file" msgstr "無法開啟指定的圖示檔" -#: ../src/appicon.c:552 ../src/dialog.c:121 ../src/dialog.c:224 -#: ../src/dialog.c:568 ../src/dialog.c:1592 ../src/dock.c:517 -#: ../src/dock.c:525 ../src/dock.c:549 ../src/dock.c:3294 -#: ../src/dockedapp.c:212 ../src/dockedapp.c:370 ../src/main.c:253 -#: ../src/rootmenu.c:1769 ../src/winspector.c:386 ../src/winspector.c:402 +#: ../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 "確定" -#: ../src/appicon.c:579 ../src/dock.c:277 +#: ../src/appicon.c:445 ../src/dock.c:244 msgid "" " will be forcibly closed.\n" "Any unsaved changes will be lost.\n" @@ -42,375 +43,461 @@ "任何未儲存的改變將會遺失。\n" "請確認。" -#: ../src/appicon.c:585 ../src/dock.c:282 ../src/winmenu.c:128 +#: ../src/appicon.c:453 ../src/dock.c:263 ../src/winmenu.c:124 msgid "Kill Application" msgstr "結束應用程式" -#: ../src/appicon.c:586 ../src/dock.c:283 ../src/winmenu.c:130 +#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126 msgid "Yes" msgstr "是" -#: ../src/appicon.c:586 ../src/dock.c:283 ../src/winmenu.c:130 +#: ../src/appicon.c:454 ../src/dock.c:264 ../src/winmenu.c:126 msgid "No" msgstr "否" -#: ../src/appicon.c:604 ../src/dock.c:1161 ../src/dock.c:3465 +#: ../src/appicon.c:484 ../src/dock.c:1168 ../src/dock.c:3501 msgid "Unhide Here" msgstr "在此顯現" -#: ../src/appicon.c:605 ../src/appicon.c:630 ../src/dock.c:1163 -#: ../src/dock.c:1165 ../src/dock.c:3477 ../src/winmenu.c:471 +#: ../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 "隱藏" -#: ../src/appicon.c:606 +#: ../src/appicon.c:486 msgid "Set Icon..." msgstr "設定圖示..." -#: ../src/appicon.c:607 ../src/dock.c:1169 ../src/rootmenu.c:226 -#: ../src/rootmenu.c:240 ../src/winmenu.c:518 +#: ../src/appicon.c:487 ../src/dock.c:1176 ../src/rootmenu.c:248 +#: ../src/rootmenu.c:264 ../src/winmenu.c:508 msgid "Kill" msgstr "結束" -#: ../src/appicon.c:628 ../src/dock.c:3475 +#: ../src/appicon.c:508 ../src/dock.c:3511 msgid "Unhide" msgstr "顯現" -#: ../src/defaults.c:904 ../src/startup.c:847 ../src/startup.c:865 -#: ../src/startup.c:871 +#: ../src/application.c:405 +#, c-format +msgid "recreating missing icon '%s'" +msgstr "重建遺失的圖示 '%s'" + +#: ../src/defaults.c:933 ../src/defaults.c:1095 +#, c-format +msgid "Domain %s (%s) of global defaults database is corrupted!" +msgstr "整體預設資料庫的定義域 %s (%s) 已損壞！" + +#: ../src/defaults.c:938 +#, c-format +msgid "could not load domain %s from global defaults database" +msgstr "無法從整體預設資料庫載入定義域 %s" + +#: ../src/defaults.c:990 ../src/defaults.c:1005 +#, c-format +msgid "invalid global menu file %s" +msgstr "全域選單檔案 %s 無效" + +#: ../src/defaults.c:1033 ../src/startup.c:762 ../src/startup.c:780 +#: ../src/startup.c:787 #, c-format msgid "could not read domain \"%s\" from defaults database" msgstr "無法從預設資料庫讀取定義域 \"%s\"" -#: ../src/defaults.c:950 ../src/defaults.c:1075 ../src/defaults.c:1114 -#: ../src/defaults.c:1144 +#: ../src/defaults.c:1079 ../src/defaults.c:1184 ../src/defaults.c:1225 +#: ../src/defaults.c:1281 #, c-format msgid "Domain %s (%s) of defaults database is corrupted!" msgstr "預設資料庫的定義域 %s (%s) 已損壞！" -#: ../src/defaults.c:955 ../src/defaults.c:1096 ../src/defaults.c:1127 -#: ../src/defaults.c:1153 +#: ../src/defaults.c:1084 ../src/defaults.c:1204 ../src/defaults.c:1261 +#: ../src/defaults.c:1291 #, c-format msgid "could not load domain %s from user defaults database" msgstr "無法從使用者預設資料庫載入定義域 %s" -#: ../src/defaults.c:966 ../src/defaults.c:1060 -#, c-format -msgid "Domain %s (%s) of global defaults database is corrupted!" -msgstr "整體預設資料庫的定義域 %s (%s) 已損壞！" - -#: ../src/defaults.c:985 +#: ../src/defaults.c:1114 #, c-format msgid "could not load domain %s from global defaults database (%s)" msgstr "無法從整體預設資料庫 (%2$s) 載入定義域 %1$s" -#: ../src/defaults.c:1065 +#: ../src/defaults.c:1251 ../src/screen.c:419 #, c-format -msgid "could not load domain %s from global defaults database" -msgstr "無法從整體預設資料庫載入定義域 %s" +msgid "could not load logo image for panels: %s" +msgstr "無法載入面板的標識影像: %s" #. --------------------------- Local ----------------------- -#: ../src/defaults.c:1362 ../src/defaults.c:1504 ../src/defaults.c:1616 -#: ../src/defaults.c:2095 ../src/defaults.c:2112 ../src/defaults.c:2157 -#: ../src/defaults.c:2204 ../src/defaults.c:2679 ../src/wdefaults.c:565 -#: ../src/wdefaults.c:601 +#: ../src/defaults.c:1500 ../src/defaults.c:1639 ../src/defaults.c:1765 +#: ../src/defaults.c:2243 ../src/defaults.c:2260 ../src/defaults.c:2305 +#: ../src/defaults.c:2352 ../src/defaults.c:2825 ../src/wdefaults.c:571 +#: ../src/wdefaults.c:604 #, c-format msgid "Wrong option format for key \"%s\". Should be %s." msgstr "key \"%s\" 的選項格式錯誤。應為 %s。" -#: ../src/defaults.c:1364 ../src/defaults.c:1445 ../src/defaults.c:1477 -#: ../src/defaults.c:1509 ../src/defaults.c:1522 ../src/defaults.c:1537 -#: ../src/defaults.c:1551 ../src/defaults.c:1621 ../src/defaults.c:1633 -#: ../src/defaults.c:2100 ../src/defaults.c:2117 ../src/defaults.c:2130 -#: ../src/defaults.c:2162 ../src/defaults.c:2178 ../src/defaults.c:2209 -#: ../src/defaults.c:2296 ../src/defaults.c:2684 ../src/defaults.c:2695 +#: ../src/defaults.c:1502 ../src/defaults.c:1583 ../src/defaults.c:1613 +#: ../src/defaults.c:1644 ../src/defaults.c:1657 ../src/defaults.c:1672 +#: ../src/defaults.c:1686 ../src/defaults.c:1770 ../src/defaults.c:1782 +#: ../src/defaults.c:2248 ../src/defaults.c:2265 ../src/defaults.c:2278 +#: ../src/defaults.c:2310 ../src/defaults.c:2326 ../src/defaults.c:2357 +#: ../src/defaults.c:2444 ../src/defaults.c:2830 ../src/defaults.c:2841 #, c-format msgid "using default \"%s\" instead" msgstr "改用預設 \"%s\"" -#: ../src/defaults.c:1395 +#: ../src/defaults.c:1533 #, c-format msgid "wrong option value for key \"%s\". Should be one of %s" msgstr "key \"%s\" 的選項值錯誤。應為 %s " -#: ../src/defaults.c:1440 +#: ../src/defaults.c:1578 #, c-format msgid "can't convert \"%s\" to boolean for key \"%s\"" msgstr "無法轉換 key \"%2$s\" 的 \"%1$s\" 成為 boolean" -#: ../src/defaults.c:1474 +#: ../src/defaults.c:1610 #, c-format msgid "can't convert \"%s\" to integer for key \"%s\"" msgstr "無法轉換 key \"%2$s\" 的 \"%1$s\" 成為整數" -#: ../src/defaults.c:1517 +#: ../src/defaults.c:1652 #, c-format msgid "Incorrect number of elements in array for key \"%s\"." msgstr "key \"%s\" 的陣列元素數目錯誤。" -#: ../src/defaults.c:1532 +#: ../src/defaults.c:1667 #, c-format msgid "Wrong value for key \"%s\". Should be Coordinate." msgstr "key \"%s\" 的值錯誤。應為座標。" -#: ../src/defaults.c:1547 +#: ../src/defaults.c:1682 #, c-format msgid "can't convert array to integers for \"%s\"." msgstr "無法為 \"%s\" 轉換陣列成為整數。" -#: ../src/defaults.c:1745 ../src/defaults.c:1777 ../src/defaults.c:1793 -#: ../src/defaults.c:1822 ../src/defaults.c:1845 ../src/defaults.c:1898 -#: ../src/defaults.c:1938 ../src/defaults.c:1976 ../src/defaults.c:1992 +#: ../src/defaults.c:1715 +#, c-format +msgid "Wrong value for key \"%s\". Should be an array." +msgstr "key \"%s\" 的值錯誤。應為陣列。" + +#: ../src/defaults.c:1893 ../src/defaults.c:1925 ../src/defaults.c:1941 +#: ../src/defaults.c:1970 ../src/defaults.c:1993 ../src/defaults.c:2046 +#: ../src/defaults.c:2086 ../src/defaults.c:2124 ../src/defaults.c:2140 #, c-format msgid "\"%s\" is not a valid color name" msgstr "\"%s\" 不是有效的顏色名" -#: ../src/defaults.c:1758 ../src/defaults.c:1810 +#: ../src/defaults.c:1906 ../src/defaults.c:1958 msgid "bad number of arguments in gradient specification" msgstr "漸層規格中引數數目錯誤" -#: ../src/defaults.c:1871 +#: ../src/defaults.c:2019 msgid "too few arguments in multicolor gradient specification" msgstr "多色漸層規格中引數太少" -#: ../src/defaults.c:1965 +#: ../src/defaults.c:2113 msgid "bad number of arguments in textured gradient specification" msgstr "材質漸層規格中引數數目錯誤" -#: ../src/defaults.c:2008 +#: ../src/defaults.c:2156 #, c-format msgid "bad opacity value for tgradient texture \"%s\". Should be [0..255]" msgstr "漸層 (tgradient) 材質 \"%s\" 不透明值錯誤。應該是 [0..255]" -#: ../src/defaults.c:2068 +#: ../src/defaults.c:2216 #, c-format msgid "could not initialize library %s" msgstr "無法啟始函式庫: %s" -#: ../src/defaults.c:2071 +#: ../src/defaults.c:2219 #, c-format msgid "could not find function %s::%s" msgstr "找不到函式 %s::%s" -#: ../src/defaults.c:2078 +#: ../src/defaults.c:2226 #, c-format msgid "invalid texture type %s" msgstr "材質型態 %s 無效" -#: ../src/defaults.c:2125 +#: ../src/defaults.c:2273 #, c-format msgid "Error in texture specification for key \"%s\"" msgstr "key \"%s\" 的材質規格錯誤" -#: ../src/defaults.c:2174 +#: ../src/defaults.c:2322 msgid "Wrong type for workspace background. Should be a texture type." msgstr "工作區背景型態錯誤。應為材質型態。" -#: ../src/defaults.c:2222 +#: ../src/defaults.c:2370 #, c-format msgid "Wrong type for background of workspace %i. Should be a texture." msgstr "工作區 %i 背景型態錯誤。應為材質。" -#: ../src/defaults.c:2264 +#: ../src/defaults.c:2412 msgid "could not load any usable font!!!" msgstr "無法載入任何可用字型!!!" -#: ../src/defaults.c:2291 +#: ../src/defaults.c:2439 #, c-format msgid "could not get color for key \"%s\"" msgstr "無法取得 key \"%s\" 的色彩" -#: ../src/defaults.c:2349 ../src/rootmenu.c:492 +#: ../src/defaults.c:2497 ../src/rootmenu.c:531 #, c-format msgid "%s:invalid key modifier \"%s\"" msgstr "%s: 鍵修正 \"%s\" 無效" -#: ../src/defaults.c:2361 +#: ../src/defaults.c:2509 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\"" msgstr "%s: 鍵盤捷徑規格 \"%s\" 無效" -#: ../src/defaults.c:2368 +#: ../src/defaults.c:2516 #, c-format msgid "%s:invalid key in shortcut \"%s\"" msgstr "%s: 捷徑 \"%s\" 的鍵無效" -#: ../src/defaults.c:2393 +#: ../src/defaults.c:2541 #, c-format msgid "%s: modifier key %s is not valid" msgstr "%s: 修正鍵 %s 不正確" -#: ../src/defaults.c:2425 -#, fuzzy, c-format +#: ../src/defaults.c:2573 +#, c-format msgid "could not load image in option %s: %s" -msgstr "無法載入預設圖示 \"%s\":%s" +msgstr "無法載入影像於選項 %s: %s" -#: ../src/defaults.c:2544 +#: ../src/defaults.c:2690 #, c-format msgid "failed to open bitmap file \"%s\"" msgstr "無法開啟映像檔 \"%s\"" -#: ../src/defaults.c:2547 +#: ../src/defaults.c:2693 #, c-format msgid "\"%s\" is not a valid bitmap file" msgstr "\"%s\" 不是有效的映像檔名" -#: ../src/defaults.c:2550 +#: ../src/defaults.c:2696 #, c-format msgid "out of memory reading bitmap file \"%s\"" msgstr "讀入 \"%s\" 映像檔時記憶體不足" -#: ../src/defaults.c:2589 ../src/defaults.c:2622 +#: ../src/defaults.c:2735 ../src/defaults.c:2768 msgid "bad number of arguments in cursor specification" msgstr "游標規格中引數數目錯誤" -#: ../src/defaults.c:2605 +#: ../src/defaults.c:2751 #, c-format msgid "unknown builtin cursor name \"%s\"" -msgstr "" +msgstr "不明的內建游標名稱 \"%s\"" -#: ../src/defaults.c:2632 ../src/defaults.c:2644 +#: ../src/defaults.c:2778 ../src/defaults.c:2790 #, c-format msgid "could not find cursor bitmap file \"%s\"" msgstr "無法找到游標映像檔 \"%s\"" -#: ../src/defaults.c:2691 +#: ../src/defaults.c:2837 #, c-format msgid "Error in cursor specification for key \"%s\"" msgstr "key \"%s\" 的游標規格錯誤" -#: ../src/defaults.c:2778 +#: ../src/defaults.c:2922 msgid "could not render texture for icon background" msgstr "無法表現圖示背景的材質" -#: ../src/dialog.c:121 ../src/dialog.c:575 ../src/dock.c:549 -#: ../src/dockedapp.c:376 ../src/rootmenu.c:188 ../src/rootmenu.c:226 -#: ../src/rootmenu.c:240 +# y, c-format +#: ../src/defaults.c:3542 ../src/defaults.c:3617 +#, c-format +msgid "Invalid arguments for option \"%s\"" +msgstr "選項 \"%s\"引數無效" + +#: ../src/defaults.c:3549 ../src/defaults.c:3624 +#, c-format +msgid "Could not find image \"%s\" for option \"%s\"" +msgstr "無法找到選項 \"%2$s\"的影像 \"%1$s\"" + +#: ../src/defaults.c:3555 ../src/defaults.c:3632 +#, c-format +msgid "Could not load image \"%s\" for option \"%s\"" +msgstr "無法載入選項 \"%2$s\"的影像 \"%1$s\"" + +#: ../src/defaults.c:3567 +msgid "Invalid split sizes for SwitchPanel back image." +msgstr "「切換面版」底圖的分割大小無效。" + +#: ../src/defaults.c:3640 +#, c-format +msgid "Invalid number of arguments for option \"%s\"" +msgstr "選項 \"%s\"的引數數目錯誤" + +#: ../src/dialog.c:147 +msgid "Save workspace state" +msgstr "儲存工作區狀態" + +#: ../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 "取消" -#: ../src/dialog.c:219 +#: ../src/dialog.c:290 msgid "Could not open directory " msgstr "無法開啟目錄" -#: ../src/dialog.c:274 +#: ../src/dialog.c:345 msgid "Could not load image file " msgstr "無法載入影像檔" -#: ../src/dialog.c:503 +#: ../src/dialog.c:659 msgid "Directories" msgstr "目錄" -#: ../src/dialog.c:512 +#: ../src/dialog.c:668 msgid "Icons" msgstr "圖示" -#: ../src/dialog.c:545 +#: ../src/dialog.c:701 msgid "Preview" -msgstr "" +msgstr "預覽" -#: ../src/dialog.c:558 +#: ../src/dialog.c:714 msgid "File Name:" msgstr "檔名:" -#: ../src/dialog.c:581 +#: ../src/dialog.c:738 msgid "Choose File" msgstr "選取檔案" -#: ../src/dialog.c:598 ../src/dialog.c:600 +#: ../src/dialog.c:757 ../src/dialog.c:759 msgid "Icon Chooser" msgstr "圖示選取器" -#: ../src/dialog.c:1034 ../src/dialog.c:1139 +#: ../src/dialog.c:1196 ../src/dialog.c:1304 #, c-format msgid "Version %s" -msgstr "" +msgstr "版本 %s" -#: ../src/dialog.c:1136 +#: ../src/dialog.c:1302 msgid "Window Manager for X" msgstr "X 底下的視窗管理員" -#: ../src/dialog.c:1160 -msgid "32 thousand" -msgstr "" - -#: ../src/dialog.c:1163 -msgid "64 thousand" -msgstr "" +#: ../src/dialog.c:1325 +#, c-format +msgid "Using visual 0x%x: %s %ibpp " +msgstr "使用 visual 0x%x: %s %ibpp " -#: ../src/dialog.c:1167 -msgid "16 million" -msgstr "" +#: ../src/dialog.c:1333 +msgid "(32 thousand colors)\n" +msgstr "(三萬二千色)\n" + +#: ../src/dialog.c:1336 +msgid "(64 thousand colors)\n" +msgstr "(六萬四千色)\n" + +#: ../src/dialog.c:1340 +msgid "(16 million colors)\n" +msgstr "(一千六百萬色)\n" -#: ../src/dialog.c:1174 +#: ../src/dialog.c:1343 #, c-format -msgid "Using visual 0x%x: %s %ibpp (%s colors)\n" -msgstr "" +msgid "(%d colors)\n" +msgstr "(%d 色)\n" -#: ../src/dialog.c:1182 +#: ../src/dialog.c:1353 #, c-format msgid "Total allocated memory: %i kB. Total memory in use: %i kB.\n" -msgstr "" +msgstr "已配置記憶體總計: %i kB。使用中憶體總計: %i kB。\n" -#: ../src/dialog.c:1188 +#: ../src/dialog.c:1360 msgid "Supported image formats: " -msgstr "" +msgstr "支援影像格式: " -#: ../src/dialog.c:1195 +#: ../src/dialog.c:1367 msgid "" "\n" -"Additional Support For: " +"Additional support for: " msgstr "" +"\n" +"額外支援: " -#: ../src/dialog.c:1214 -msgid "Sound" +#: ../src/dialog.c:1384 +msgid " and " +msgstr " 和 " + +#: ../src/dialog.c:1394 +msgid "" +"\n" +"Sound disabled" msgstr "" +"\n" +"音效未啟動" -#: ../src/dialog.c:1221 -msgid " and " +#: ../src/dialog.c:1396 +msgid "" +"\n" +"Sound enabled" msgstr "" +"\n" +"音效已啟動" + +#: ../src/dialog.c:1401 +msgid ", VirtualDesktop enabled" +msgstr "，虛擬桌面已啟動" + +#: ../src/dialog.c:1403 +msgid ", VirtualDesktop disabled" +msgstr "，虛擬桌面未啟動" + +#: ../src/dialog.c:1407 +msgid "\n" +msgstr "\n" + +#: ../src/dialog.c:1409 +msgid "Solaris " +msgstr "Solaris " -#: ../src/dialog.c:1250 +#: ../src/dialog.c:1411 +msgid "Xinerama: " +msgstr "Xinerama: " + +#: ../src/dialog.c:1445 msgid "Info" -msgstr "" +msgstr "資訊" -#: ../src/dialog.c:1273 -msgid "Merry X'mas!" -msgstr "" +#: ../src/dialog.c:1469 +msgid "Merry Christmas!" +msgstr "聖誕快樂！" -#: ../src/dialog.c:1343 +#: ../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:1364 +#: ../src/dialog.c:1563 msgid "Legal" -msgstr "" +msgstr "法律" -#: ../src/dialog.c:1516 ../src/startup.c:349 +#: ../src/dialog.c:1719 msgid "cannot open connection for crashing dialog panel. Aborting." -msgstr "" +msgstr "無法開啟崩潰對話面板的連線。放棄中。" -#: ../src/dialog.c:1542 +#: ../src/dialog.c:1745 msgid "Fatal error" -msgstr "" +msgstr "嚴重錯誤" -#: ../src/dialog.c:1553 +#: ../src/dialog.c:1756 #, c-format msgid "" "Window Maker received signal %i\n" @@ -419,41 +506,40 @@ "Window Maker 收到訊號 %i\n" "(%s)." -#: ../src/dialog.c:1556 +#: ../src/dialog.c:1759 #, c-format msgid "Window Maker received signal %i." msgstr "Window Maker 收到訊號 %i。" -#: ../src/dialog.c:1565 +#: ../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 "" -"這個嚴重錯誤可能是因為程式錯誤所致。請填寫附帶的 BUGFORM " -"並向 bugs@windowmaker.org 提出報告。" +"這個嚴重錯誤可能是因為程式錯誤所致。請填寫附帶的 BUGFORM 並向 " +"bugs@windowmaker.org 提出報告。" -#: ../src/dialog.c:1573 +#: ../src/dialog.c:1777 msgid "What do you want to do now?" -msgstr "" +msgstr "你現在要做什麼？" -#: ../src/dialog.c:1579 -#, fuzzy +#: ../src/dialog.c:1783 msgid "Select action" -msgstr "選取圖示（取消）" +msgstr "選取動作" -#: ../src/dialog.c:1580 +#: ../src/dialog.c:1784 msgid "Abort and leave a core file" -msgstr "" +msgstr "放棄並留下 core 檔" -#: ../src/dialog.c:1581 +#: ../src/dialog.c:1785 msgid "Restart Window Maker" msgstr "重新啟動 Window Maker" -#: ../src/dialog.c:1582 +#: ../src/dialog.c:1786 msgid "Start alternate window manager" msgstr "啟動另一套視窗管理員" -#: ../src/dialog.c:1760 +#: ../src/dialog.c:1964 msgid "" "Window Maker is part of the GNUstep project.\n" "The GNUstep project aims to create a free\n" @@ -466,492 +552,505 @@ "GNUstep, please visit: www.gnustep.org" msgstr "" -#: ../src/dialog.c:1780 +#: ../src/dialog.c:1987 msgid "About GNUstep" msgstr "有關 GNUstep" -#: ../src/dock.c:213 +#: ../src/dock.c:193 #, c-format msgid "Type the name for workspace %i:" msgstr "輸入工作區 %i 名稱:" -#: ../src/dock.c:214 ../src/dock.c:1125 ../src/dock.c:1128 ../src/dock.c:3383 +#: ../src/dock.c:194 ../src/dock.c:1132 ../src/dock.c:1135 ../src/dock.c:3419 msgid "Rename Workspace" msgstr "工作區更名" -#: ../src/dock.c:511 ../src/dock.c:519 +#: ../src/dock.c:509 ../src/dock.c:517 msgid "Warning" -msgstr "" +msgstr "警告" -#: ../src/dock.c:512 +#: ../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 "" +"有些圖示無法變成無所不在。請確認無其他圖示停靠在其他工作區的相同位置" +"且某些工作區的迴紋針未滿。" -#: ../src/dock.c:520 +#: ../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 "" +"圖示無法變成無所不在。請確認無其他圖示停靠在其他工作區的相同位置" +"且某些工作區的迴紋針未滿。" -#: ../src/dock.c:547 +#: ../src/dock.c:545 msgid "Workspace Clip" msgstr "工作區迴紋針" -#: ../src/dock.c:548 +#: ../src/dock.c:546 msgid "All selected icons will be removed!" msgstr "所有選取的圖示會被刪除！" -#: ../src/dock.c:599 ../src/dock.c:1140 ../src/dock.c:1142 ../src/dock.c:3419 +#: ../src/dock.c:598 ../src/dock.c:1147 ../src/dock.c:1149 ../src/dock.c:3455 msgid "Keep Icon" msgstr "保持圖示" -#: ../src/dock.c:600 ../src/dock.c:2122 ../src/dock.c:2256 +#: ../src/dock.c:599 ../src/dock.c:2139 ../src/dock.c:2276 msgid "Type the command used to launch the application" msgstr "輸入用來啟動應用程式的命令" -#: ../src/dock.c:951 +#: ../src/dock.c:954 #, c-format msgid "could not launch application %s\n" msgstr "無法啟動應用程式 %s\n" -#: ../src/dock.c:1006 +#: ../src/dock.c:1010 msgid "could not create workspace submenu for Clip menu" msgstr "無法為迴紋針選單建立工作區副選單" -#: ../src/dock.c:1029 ../src/dock.c:1072 ../src/dock.c:1117 ../src/dock.c:3363 -msgid "Keep on Top" -msgstr "保持在最上層" - -#: ../src/dock.c:1031 ../src/dock.c:3365 -msgid "Allow Lowering" -msgstr "" - -#: ../src/dock.c:1068 +#: ../src/dock.c:1069 msgid "could not create options submenu for Clip menu" msgstr "無法為迴紋針選單建立選項副選單" -#: ../src/dock.c:1075 +#: ../src/dock.c:1073 ../src/dock.c:1121 +msgid "Keep on Top" +msgstr "保持在最上層" + +#: ../src/dock.c:1079 msgid "Collapsed" msgstr "折疊" -#: ../src/dock.c:1081 -msgid "AutoCollapse" +#: ../src/dock.c:1085 +msgid "Autocollapse" msgstr "自動折疊" -#: ../src/dock.c:1087 -msgid "AutoRaiseLower" +#: ../src/dock.c:1091 +msgid "Autoraise" msgstr "自動升降" -#: ../src/dock.c:1093 -msgid "AutoAttract Icons" +#: ../src/dock.c:1097 +msgid "Autoattract Icons" msgstr "自動吸引圖示" -#: ../src/dock.c:1120 +#: ../src/dock.c:1127 msgid "Clip Options" msgstr "迴紋針選項" -#: ../src/dock.c:1130 +#: ../src/dock.c:1137 msgid "Selected" msgstr "已選取" -#: ../src/dock.c:1135 ../src/dock.c:1138 ../src/dock.c:3410 -#, fuzzy +#: ../src/dock.c:1142 ../src/dock.c:1145 ../src/dock.c:3446 msgid "Select All Icons" -msgstr "選取所有圖示（取消）" +msgstr "選取所有圖示" -#: ../src/dock.c:1144 ../src/dock.c:1146 ../src/dock.c:3427 +#: ../src/dock.c:1151 ../src/dock.c:1153 ../src/dock.c:3463 msgid "Move Icon To" msgstr "移動圖示至" -#: ../src/dock.c:1151 ../src/dock.c:1154 ../src/dock.c:3438 +#: ../src/dock.c:1158 ../src/dock.c:1161 ../src/dock.c:3474 msgid "Remove Icon" msgstr "刪除圖示" -#: ../src/dock.c:1156 +#: ../src/dock.c:1163 msgid "Attract Icons" msgstr "吸引圖示" -#: ../src/dock.c:1159 +#: ../src/dock.c:1166 msgid "Launch" msgstr "啟動" -#: ../src/dock.c:1167 +#: ../src/dock.c:1174 msgid "Settings..." msgstr "設定..." -#: ../src/dock.c:1526 ../src/dock.c:1629 +#: ../src/dock.c:1538 ../src/dock.c:1645 #, c-format msgid "bad value in docked icon state info %s" msgstr "停靠的圖示狀態資訊 %s 值不正確" -#: ../src/dock.c:1637 +#: ../src/dock.c:1653 #, c-format msgid "bad value in docked icon position %i,%i" msgstr "停靠的圖示位置 %i,%i 值不正確" -#: ../src/dock.c:1657 +#: ../src/dock.c:1673 #, c-format msgid "bad value in dock state info:%s" msgstr "停靠區的狀態資訊 %s 值不正確" -#: ../src/dock.c:1889 +#: ../src/dock.c:1923 msgid "there are too many icons stored in dock. Ignoring what doesn't fit" msgstr "太多圖示存放在停靠區。忽略不適當的" #. icon->forced_dock = 1; -#: ../src/dock.c:2121 ../src/dock.c:2255 +#: ../src/dock.c:2138 ../src/dock.c:2275 msgid "Dock Icon" msgstr "停靠圖示" -#: ../src/dock.c:3286 ../src/dock.c:3290 +#: ../src/dock.c:3333 #, c-format msgid "Could not execute command \"%s\"" msgstr "無法執行命令 \"%s\"" -#: ../src/dock.c:3389 -#, fuzzy +#: ../src/dock.c:3425 msgid "Toggle Omnipresent" -msgstr "無所不在" +msgstr "切換無所不在" -#: ../src/dock.c:3394 ../src/winmenu.c:423 ../src/winspector.c:1376 +#: ../src/dock.c:3430 ../src/winmenu.c:414 ../src/winspector.c:1383 msgid "Omnipresent" msgstr "無所不在" -#: ../src/dock.c:3408 -#, fuzzy +#: ../src/dock.c:3444 msgid "Unselect All Icons" -msgstr "選取所有圖示（取消）" +msgstr "取消選取所有圖示" -#: ../src/dock.c:3417 +#: ../src/dock.c:3453 msgid "Keep Icons" msgstr "保持圖示" -#: ../src/dock.c:3425 +#: ../src/dock.c:3461 msgid "Move Icons To" msgstr "移動圖示至" -#: ../src/dock.c:3436 +#: ../src/dock.c:3472 msgid "Remove Icons" msgstr "刪除圖示" -#: ../src/dock.c:3467 +#: ../src/dock.c:3503 msgid "Bring Here" -msgstr "" +msgstr "帶至這理" -#: ../src/dockedapp.c:131 +#: ../src/dockedapp.c:150 #, c-format msgid "could not find icon %s, used in a docked application" msgstr "無法找到圖示 %s，用於停靠的應用程式" -#: ../src/dockedapp.c:210 +#: ../src/dockedapp.c:230 #, c-format msgid "Could not open specified icon file: %s" msgstr "無法開啟指定的圖示檔: %s" -#: ../src/dockedapp.c:212 +#: ../src/dockedapp.c:232 msgid "Ignore" -msgstr "" +msgstr "忽略" -#: ../src/dockedapp.c:305 -msgid "Start when WindowMaker is started" -msgstr "當 WindowMaker 啟動時啟動" +#: ../src/dockedapp.c:334 +msgid "Start when Window Maker is started" +msgstr "當 Window Maker 啟動時啟動" -#: ../src/dockedapp.c:312 +#: ../src/dockedapp.c:341 msgid "Lock (prevent accidental removal)" -msgstr "" +msgstr "鎖定 (防止意外刪除)" -#: ../src/dockedapp.c:318 +#: ../src/dockedapp.c:345 msgid "Application path and arguments" msgstr "應用程式路徑與引數" -#: ../src/dockedapp.c:329 +#: ../src/dockedapp.c:358 +msgid "Command for middle-click launch" +msgstr "滑鼠中鍵開啟的程式" + +#: ../src/dockedapp.c:372 +#, c-format +msgid "%s will be replaced with current selection" +msgstr "%s 會被目前選定物取代" + +#: ../src/dockedapp.c:377 msgid "Command for files dropped with DND" msgstr "DND 放置檔案的命令" -#: ../src/dockedapp.c:341 +#: ../src/dockedapp.c:391 #, c-format msgid "%d will be replaced with the file name" msgstr "%d 會被檔名取代" -#: ../src/dockedapp.c:345 +#: ../src/dockedapp.c:395 msgid "DND support was not compiled in" msgstr "未編譯入 DND 支援" -#: ../src/dockedapp.c:351 +#: ../src/dockedapp.c:400 msgid "Icon Image" msgstr "圖示影像" -#: ../src/dockedapp.c:363 ../src/winspector.c:1514 +#: ../src/dockedapp.c:414 ../src/winspector.c:1521 msgid "Browse..." msgstr "瀏覽..." -#: ../src/dockedapp.c:408 +#: ../src/dockedapp.c:475 msgid "Docked Application Settings" msgstr "停靠的應用程式設定" -#: ../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 "無法表現材質: %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 "表現影像錯誤: %s" -#: ../src/framewin.c:777 +#: ../src/framewin.c:775 #, c-format msgid "error rendering image: %s" msgstr "表現影像錯誤: %s" -#: ../src/icon.c:229 ../src/wdefaults.c:435 +#: ../src/icon.c:239 ../src/wdefaults.c:443 #, c-format msgid "error loading image file \"%s\"" msgstr "載入影像檔錯誤 \"%s\"" -#: ../src/icon.c:488 ../src/icon.c:497 +#: ../src/icon.c:503 ../src/icon.c:512 #, c-format msgid "could not create directory %s" msgstr "無法建立目錄 %s" -#: ../src/icon.c:764 +#: ../src/icon.c:782 #, c-format msgid "could not find default icon \"%s\"" msgstr "無法載入預設圖示 \"%s\"" -#: ../src/icon.c:770 +#: ../src/icon.c:788 #, c-format msgid "could not load default icon \"%s\":%s" msgstr "無法載入預設圖示 \"%s\":%s" -#: ../src/main.c:203 +#: ../src/main.c:220 msgid "failed to restart Window Maker." -msgstr "" +msgstr "重新啟動 Window Maker 失敗。" -#: ../src/main.c:206 +#: ../src/main.c:223 #, c-format msgid "could not exec %s" msgstr "無法執行 %s" -#: ../src/main.c:251 +#: ../src/main.c:269 msgid "Could not execute command: " msgstr "無法執行命令: " -#: ../src/main.c:408 +#: ../src/main.c:426 #, c-format msgid "%s aborted.\n" msgstr "%s 放棄。\n" -#: ../src/main.c:419 +#: ../src/main.c:437 #, c-format msgid "Usage: %s [options]\n" msgstr "使用法： %s [選項]\n" -#: ../src/main.c:420 +#: ../src/main.c:438 msgid "The Window Maker window manager for the X window system" msgstr "The Window Maker window manager for the X window system" -#: ../src/main.c:422 +#: ../src/main.c:440 msgid " -display host:dpy\tdisplay to use" msgstr " -display host:dpy\t要使用的 display" -#: ../src/main.c:424 +#: ../src/main.c:442 msgid " --no-cpp \t\tdisable preprocessing of configuration files" msgstr " --no-cpp \t\t不預先處理設定檔" -#: ../src/main.c:426 +#: ../src/main.c:444 msgid " --no-dock\t\tdo not open the application Dock" msgstr " --no-dock\t\t不要開啟程式停靠區" -#: ../src/main.c:427 +#: ../src/main.c:445 msgid " --no-clip\t\tdo not open the workspace Clip" msgstr " --no-clip\t\t不要開啟工作區迴紋針" -#: ../src/main.c:428 -#, fuzzy +#: ../src/main.c:446 msgid " --no-autolaunch\tdo not autolaunch applications" -msgstr " --no-autolaunch\t不要自動啟動應用程式\n" +msgstr " --no-autolaunch\t不要自動啟動應用程式" -#: ../src/main.c:429 +#: ../src/main.c:447 msgid " --dont-restore\t\tdo not restore saved session" -msgstr "" +msgstr " --dont-restore\t\t不要回存已儲存時段" -#: ../src/main.c:431 +#: ../src/main.c:449 msgid " --locale locale\tlocale to use" -msgstr "" +msgstr " --locale locale\t使用的 locale" -#: ../src/main.c:433 +#: ../src/main.c:451 msgid "" " --create-stdcmap\tcreate the standard colormap hint in PseudoColor visuals" msgstr "" +" --create-stdcmap\t在虛擬色彩畫面中建立標準色彩對映提示" -#: ../src/main.c:434 +#: ../src/main.c:452 msgid " --visual-id visualid\tvisual id of visual to use" msgstr " --visual-id visualid\t所欲使用的 visual 之 visualid" -#: ../src/main.c:435 +#: ../src/main.c:453 msgid " --static\t\tdo not update or save configurations" msgstr " --static\t\t不要更新或儲存設定檔" -#: ../src/main.c:436 -#, fuzzy +#: ../src/main.c:454 msgid " --no-polling\t\tdo not periodically check for configuration updates" -msgstr " --no-polling\t\t不要定時檢查設定檔有沒有更新" +msgstr " --no-polling\t\t不要定時檢查設定檔更新" -#: ../src/main.c:438 +#: ../src/main.c:456 msgid " --synchronous\t\tturn on synchronous display mode" -msgstr "" +msgstr " --synchronous\t\t開啟同步顯示模式" -#: ../src/main.c:440 +#: ../src/main.c:458 msgid " --version\t\tprint version and exit" msgstr " --version\t\t印出版本編號並離開" -#: ../src/main.c:441 +#: ../src/main.c:459 msgid " --help\t\t\tshow this message" msgstr " --help\t\t\t顯示本說明訊息" -#: ../src/main.c:453 +#: ../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 目錄 (%s)。\n" -"確定您已經安裝 WindowMaker 正確且執行 wmaker.inst" +"確定你已經安裝 WindowMaker 正確且執行 wmaker.inst" -#: ../src/main.c:474 ../src/main.c:479 +#: ../src/main.c:478 +#, c-format +msgid "could not find user GNUstep directory (%s)." +msgstr "無法找到使用者 GNUstep 目錄 (%s)。" + +#: ../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 "" +"建立 GNUstep 目錄時發生錯誤，請確定你已正確地安裝" +"Window Maker 且執行 wmaker.inst" + +#: ../src/main.c:484 +#, c-format +msgid "%s directory created with default configuration." +msgstr "%s 目錄已以預設設定建立。" + +#: ../src/main.c:506 ../src/main.c:511 #, c-format msgid "%s:could not execute initialization script" msgstr "%s: 啟始手稿無法執行" -#: ../src/main.c:499 ../src/main.c:504 +#: ../src/main.c:533 ../src/main.c:538 #, c-format msgid "%s:could not execute exit script" msgstr "%s: 離開手稿無法執行" -#: ../src/main.c:620 ../src/main.c:628 ../src/main.c:636 ../src/main.c:656 +#: ../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 "%s 的引數太少" -#: ../src/main.c:640 +#: ../src/main.c:742 #, c-format msgid "bad value for visualid: \"%s\"" msgstr "visualid 的值不正確: \"%s\"" # y, c-format -#: ../src/main.c:664 +#: ../src/main.c:766 #, c-format msgid "%s: invalid argument '%s'\n" msgstr "%s: 引數 '%s' 無效\n" -#: ../src/main.c:665 +#: ../src/main.c:767 #, c-format msgid "Try '%s --help' for more information\n" msgstr "試用 '%s --help' 來獲得更多資訊\n" -#: ../src/main.c:696 +#: ../src/main.c:802 msgid "X server does not support locale" msgstr "X 伺服器不支援 locale" -#: ../src/main.c:700 +#: ../src/main.c:806 msgid "cannot set locale modifiers" msgstr "無法設定 locale modifiers" -#: ../src/main.c:716 +#: ../src/main.c:822 #, c-format msgid "could not open display \"%s\"" msgstr "無法開啟 display \"%s\"" -#: ../src/menu.c:1255 +#: ../src/menu.c:1273 msgid "could not grab keyboard" msgstr "無法抓取鍵盤" -#: ../src/menu.c:2565 +#: ../src/menu.c:2612 #, c-format msgid "bad value in menus state info:%s" msgstr "選單的狀態資訊 %s 值不正確" -#: ../src/misc.c:71 +#: ../src/misc.c:65 #, c-format msgid "could not define value for %s for cpp" msgstr "無法定義 cpp 的 %s 的值" -#: ../src/misc.c:101 +#: ../src/misc.c:95 #, c-format msgid "could not get password entry for UID %i" msgstr "無法取得 UID %i 的密碼記錄" -#: ../src/misc.c:127 +#: ../src/misc.c:120 #, c-format msgid "your machine is misconfigured. HOSTNAME is set to %s" -msgstr "您的機器設定錯誤。HOSTNAME 設為 %s" +msgstr "你的機器設定錯誤。HOSTNAME 設為 %s" -#: ../src/misc.c:133 +#: ../src/misc.c:126 #, c-format msgid "your machine is misconfigured. HOST is set to %s" -msgstr "您的機器設定錯誤。HOST 設為 %s" +msgstr "你的機器設定錯誤。HOST 設為 %s" -#: ../src/misc.c:632 +#: ../src/misc.c:621 msgid "Program Arguments" msgstr "程式引數" -#: ../src/misc.c:633 +#: ../src/misc.c:622 msgid "Enter command arguments:" msgstr "輸入命令引數:" -#: ../src/misc.c:726 -msgid "unable to get dropped data from DND drop" -msgstr "無法從 DND 放置取得放置資料" - -#: ../src/misc.c:734 -msgid "error getting dropped data from DND drop" -msgstr "從 DND 放置取得放置資料錯誤" - -#: ../src/misc.c:740 -msgid "out of memory while getting data from DND drop" -msgstr "從 DND 放置取得資料時記憶體不足" - -#: ../src/misc.c:785 ../src/misc.c:925 +#: ../src/misc.c:736 ../src/misc.c:874 #, c-format msgid "out of memory during expansion of \"%s\"" msgstr "展開 \"%s\" 時記憶體不足" -#: ../src/misc.c:839 +#: ../src/misc.c:790 msgid "out of memory during expansion of \"%w\"" msgstr "展開 \"%w\" 時記憶體不足" # -#: ../src/misc.c:857 +#: ../src/misc.c:808 msgid "out of memory during expansion of \"%W\"" msgstr "展開 \"%W\" 時記憶體不足" -#: ../src/misc.c:873 +#: ../src/misc.c:824 +#, c-format msgid "out of memory during expansion of \"%a\"" msgstr "展開 \"%a\" 時記憶體不足" -#: ../src/misc.c:904 +#: ../src/misc.c:853 #, c-format msgid "out of memory during expansion of \"%d\"" msgstr "展開 \"%d\" 時記憶體不足" -#: ../src/misc.c:918 +#: ../src/misc.c:867 msgid "selection not available" msgstr "選取不能使用" -#: ../src/misc.c:991 ../src/misc.c:997 +#: ../src/misc.c:911 ../src/misc.c:917 #, c-format msgid "bad window name value in %s state info" msgstr "%s 狀態資訊中有無效的視窗名稱值" -#: ../src/misc.c:1253 +#: ../src/misc.c:1156 msgid "could not send message to background image helper" msgstr "無法傳送訊息至背景影像助手" @@ -960,70 +1059,6 @@ msgid "could not load mask bitmap file \"%s\". Won't use mask" msgstr "無法載入遮罩位元映像檔 \"%s\"。不使用遮罩" -#: ../src/proplist.c:151 -#, c-format -msgid "syntax error in %s, line %i:%s" -msgstr "" - -#: ../src/proplist.c:180 -msgid "unterminated string" -msgstr "字串未終止" - -#: ../src/proplist.c:247 -msgid "unterminated array" -msgstr "陣列未終止" - -#: ../src/proplist.c:256 -msgid "missing , in array or unterminated array" -msgstr "在陣列缺少 , 或陣列未終止" - -#: ../src/proplist.c:267 -msgid "could not get array element" -msgstr "無法取得陣列元素" - -#: ../src/proplist.c:297 -msgid "unterminated dictionary" -msgstr "字點未終止" - -#: ../src/proplist.c:315 -msgid "missing dictionary key" -msgstr "缺少字典鍵" - -#: ../src/proplist.c:317 -msgid "missing dictionary entry key or unterminated dictionary" -msgstr "缺少字典記錄鍵或字典未中止" - -#: ../src/proplist.c:323 -msgid "error parsing dictionary key" -msgstr "字典鍵解析錯誤" - -#: ../src/proplist.c:332 -msgid "missing = in dictionary entry" -msgstr "字典記錄中缺少 = " - -#: ../src/proplist.c:351 -msgid "missing ; in dictionary entry" -msgstr "字典記錄中缺少 ; " - -#: ../src/proplist.c:432 -msgid "" -"was expecting a string, dictionary, data or array. If it's a string, try " -"enclosing it with \"." -msgstr "要求字串，字典，資料或陣列。如果是字串，請用 \" 號括起來。" - -#: ../src/proplist.c:434 -msgid "Comments are not allowed inside WindowMaker owned domain files." -msgstr "在 WindowMaker 的定義域檔中不允許註解。" - -#: ../src/proplist.c:453 -#, c-format -msgid "could not open domain file %s" -msgstr "無法開啟定義域檔 %s" - -#: ../src/proplist.c:466 -msgid "extra data after end of file" -msgstr "檔案結束後有額外資料" - #: ../src/resources.c:44 #, c-format msgid "could not parse color \"%s\"" @@ -1034,19 +1069,19 @@ msgid "could not allocate color \"%s\"" msgstr "無法配置色彩 \"%s\"" -#: ../src/rootmenu.c:186 ../src/rootmenu.c:188 +#: ../src/rootmenu.c:196 ../src/rootmenu.c:198 msgid "Exit" msgstr "離開" -#: ../src/rootmenu.c:187 +#: ../src/rootmenu.c:197 msgid "Exit window manager?" msgstr "離開視窗管理員？" -#: ../src/rootmenu.c:223 +#: ../src/rootmenu.c:245 msgid "Close X session" msgstr "關閉 X 視窗系統" -#: ../src/rootmenu.c:224 +#: ../src/rootmenu.c:246 msgid "" "Close Window System session?\n" "Kill might close applications with unsaved data." @@ -1058,15 +1093,15 @@ #. entry = wMenuAddCallback(menu, _("Select Shortcut"), NULL, NULL); #. wMenuEntrySetCascade(menu, entry, makeMakeShortcutMenu(scr)); #. -#: ../src/rootmenu.c:226 ../src/winmenu.c:511 +#: ../src/rootmenu.c:248 ../src/winmenu.c:501 msgid "Close" msgstr "關閉" -#: ../src/rootmenu.c:237 +#: ../src/rootmenu.c:261 msgid "Kill X session" msgstr "結束 X 視窗系統" -#: ../src/rootmenu.c:238 +#: ../src/rootmenu.c:262 msgid "" "Kill Window System session?\n" "(all applications will be closed)" @@ -1074,197 +1109,197 @@ "結束視窗系統？\n" "（所有應用程式會被關閉）" -#: ../src/rootmenu.c:505 +#: ../src/rootmenu.c:544 #, c-format msgid "%s:invalid kbd shortcut specification \"%s\" for entry %s" msgstr "%s: 鍵盤捷徑規格 \"%s\" 無效 (%s)" -#: ../src/rootmenu.c:513 +#: ../src/rootmenu.c:552 #, c-format msgid "%s:invalid key in shortcut \"%s\" for entry %s" msgstr "%s: 捷徑 \"%s\" 的鍵無效 (%s)" -#: ../src/rootmenu.c:566 +#: ../src/rootmenu.c:605 #, c-format msgid "%s: unmatched '\"' in menu file" msgstr "%s: 選單檔中 '\"' 不成對" -#: ../src/rootmenu.c:616 +#: ../src/rootmenu.c:655 #, c-format msgid "%s: missing command" msgstr "%s: 缺少命令" -#: ../src/rootmenu.c:648 +#: ../src/rootmenu.c:687 #, c-format msgid "invalid OPEN_MENU specification: %s" msgstr "無效的 OPEN_MENU 規格: %s" -#: ../src/rootmenu.c:696 +#: ../src/rootmenu.c:738 #, c-format msgid "%s:could not stat menu" msgstr "%s: 無法 stat 選單" -#: ../src/rootmenu.c:704 +#: ../src/rootmenu.c:746 #, c-format msgid "%s:could not stat menu:%s" msgstr "%s: 無法 stat 選單: %s" -#: ../src/rootmenu.c:722 +#: ../src/rootmenu.c:764 #, c-format msgid "too many parameters in OPEN_MENU: %s" msgstr "OPEN_MENU 中有太多參數: %s" -#: ../src/rootmenu.c:758 +#: ../src/rootmenu.c:808 msgid "" "There are more than one WORKSPACE_MENU commands in the applications menu. " "Only one is allowed." msgstr "應用程式選單中有超過一個 WORKSPACE_MENU 命令。只允許有一個。" -#: ../src/rootmenu.c:787 ../src/rootmenu.c:805 ../src/rootmenu.c:815 +#: ../src/rootmenu.c:842 +msgid "" +"There are more than one WINDOWS_MENU commands in the applications menu. Only " +"one is allowed." +msgstr "應用程式選單中有超過一個 WINDOWS_MENU 命令。只允許有一個。" + +#: ../src/rootmenu.c:847 +msgid "Window List" +msgstr "視窗清單" + +#: ../src/rootmenu.c:876 ../src/rootmenu.c:894 ../src/rootmenu.c:904 #, c-format msgid "%s:missing parameter for menu command \"%s\"" msgstr "%s: 選單命令 \"%s\" 缺少參數" -#: ../src/rootmenu.c:879 +#: ../src/rootmenu.c:972 #, c-format msgid "%s:unknown command \"%s\" in menu config." -msgstr "%s: 選單設定中有不名的命令 \"%s\"。" +msgstr "%s: 選單設定中有不明的命令 \"%s\"。" -#: ../src/rootmenu.c:887 +#: ../src/rootmenu.c:980 #, c-format msgid "%s:can't add shortcut for entry \"%s\"" msgstr "%s: 無法為 \"%s\" 增加捷徑" -#: ../src/rootmenu.c:1024 +#: ../src/rootmenu.c:1117 #, c-format msgid "%s:maximal line size exceeded in menu config: %s" msgstr "%s: 選單檔中超過最大行數: %s" -#: ../src/rootmenu.c:1046 ../src/rootmenu.c:1138 ../src/rootmenu.c:1239 +#: ../src/rootmenu.c:1139 ../src/rootmenu.c:1232 ../src/rootmenu.c:1336 #, c-format msgid "%s:missing command in menu config: %s" msgstr "%s: 選單設定中缺少命令: %s" -#: ../src/rootmenu.c:1076 +#: ../src/rootmenu.c:1169 #, c-format msgid "%s:syntax error in menu file:END declaration missing" msgstr "%s: 選單檔中語法錯誤: 缺少 END 宣告" -#: ../src/rootmenu.c:1105 ../src/rootmenu.c:1204 +#: ../src/rootmenu.c:1198 ../src/rootmenu.c:1300 msgid "could not make arguments for menu file preprocessor" msgstr "無法為選單檔預先處理器產生引數" -#: ../src/rootmenu.c:1111 ../src/rootmenu.c:1211 +#: ../src/rootmenu.c:1205 ../src/rootmenu.c:1308 #, c-format msgid "%s:could not open/preprocess menu file" msgstr "%s: 無法開啟/預先處理選單檔" -#: ../src/rootmenu.c:1123 ../src/rootmenu.c:1224 +#: ../src/rootmenu.c:1217 ../src/rootmenu.c:1321 #, c-format msgid "%s:could not open menu file" msgstr "%s: 無法開啟選單檔" -#: ../src/rootmenu.c:1150 +#: ../src/rootmenu.c:1244 #, c-format msgid "%s:invalid menu file. MENU command is missing" msgstr "%s: 無效的選單檔。缺少 MENU 命令" -#: ../src/rootmenu.c:1159 +#: ../src/rootmenu.c:1253 msgid "error reading preprocessed menu data" msgstr "預先處理選單資料讀取錯誤" -#: ../src/rootmenu.c:1251 +#: ../src/rootmenu.c:1348 #, c-format msgid "%s:no title given for the root menu" msgstr "%s: 沒有給主選單標題" -#: ../src/rootmenu.c:1341 ../src/rootmenu.c:1416 ../src/rootmenu.c:1459 +#: ../src/rootmenu.c:1439 ../src/rootmenu.c:1512 ../src/rootmenu.c:1553 #, c-format msgid "out of memory while constructing directory menu %s" msgstr "建立目錄選單 %s 時記憶體不足" -#: ../src/rootmenu.c:1351 +#: ../src/rootmenu.c:1449 #, c-format msgid "%s:could not stat file \"%s\" in menu directory" msgstr "%s: 無法 stat 選單目錄中檔案 \"%s\"" -#: ../src/rootmenu.c:1513 +#: ../src/rootmenu.c:1607 msgid "Commands" msgstr "命令" -#: ../src/rootmenu.c:1516 +#: ../src/rootmenu.c:1610 msgid "Restart" msgstr "重新啟動" -#: ../src/rootmenu.c:1517 +#: ../src/rootmenu.c:1611 msgid "Exit..." msgstr "離開..." -#: ../src/rootmenu.c:1562 +#: ../src/rootmenu.c:1656 #, c-format msgid "could not find menu file \"%s\" referenced in WMRootMenu" msgstr "無法找到 WMRootMenu 參照的選單檔 \"%s\"" -#: ../src/rootmenu.c:1569 +#: ../src/rootmenu.c:1663 #, c-format msgid "could not access menu \"%s\" referenced in WMRootMenu" msgstr "無法存取 WMRootMenu 參照的選單檔 \"%s\"" -#: ../src/rootmenu.c:1580 +#: ../src/rootmenu.c:1674 #, c-format msgid "" "using default menu file \"%s\" as the menu referenced in WMRootMenu could " "not be found " msgstr "無法找到 WMRootMenu 參照的選單，使用預設選單檔 \"%s\"" -#: ../src/rootmenu.c:1603 ../src/rootmenu.c:1679 +#: ../src/rootmenu.c:1697 ../src/rootmenu.c:1773 #, c-format msgid "%s:format error in root menu configuration \"%s\"" msgstr "%s: 主選單設定中格式錯誤 \"%s\"" -#: ../src/rootmenu.c:1766 +#: ../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 "" +"無法載入應用程式選單。錯誤的詳細描述請查看主控台輸除。" -#: ../src/screen.c:460 -#, c-format -msgid "could not load logo image for panels: %s" -msgstr "無法載入面板的標識影像: %s" - -#: ../src/screen.c:464 -#, c-format -msgid "error making logo image for panel:%s" -msgstr "面板的標識影像產生錯誤: %s" - -#: ../src/screen.c:750 +#: ../src/screen.c:709 #, c-format msgid "could not initialize graphics library context: %s" msgstr "無法啟始圖形函式庫關連: %s" -#: ../src/screen.c:781 -msgid "could not do initialization of WINGs widget set" +#: ../src/screen.c:737 +msgid "could not initialize WINGs widget set" msgstr "無法啟始 WINGs widget set" -#: ../src/screen.c:1150 +#: ../src/screen.c:1144 #, c-format msgid "could not save session state in %s" -msgstr "無法在 %s 儲存階段狀態" +msgstr "無法在 %s 儲存時段狀態" -#: ../src/session.c:183 ../src/wdefaults.c:583 ../src/winspector.c:449 +#: ../src/session.c:183 ../src/wdefaults.c:589 ../src/winspector.c:459 #, c-format msgid "can't convert \"%s\" to boolean" msgstr "無法轉換 \"%s\" 至 boolean" #: ../src/session.c:1018 -#, fuzzy msgid "out of memory while saving session state" -msgstr "儲存階段狀態時記憶體不足" +msgstr "儲存時段狀態時記憶體不足" -#: ../src/session.c:1109 +#: ../src/session.c:1101 msgid "end of memory while saving session state" -msgstr "儲存階段狀態時記憶體不足" +msgstr "儲存時段狀態時記憶體終止" #. This is not fatal but can mean the session manager exited. #. * If the session manager exited normally we would get a @@ -1272,106 +1307,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:1243 +#: ../src/session.c:1239 msgid "connection to the session manager was lost" -msgstr "遺失至階段管理員的連結" +msgstr "遺失至時段管理員的連結" -#: ../src/stacking.c:73 +#: ../src/stacking.c:81 msgid "could not get window list!!" msgstr "無法得到視窗清單!!" -#: ../src/startup.c:202 +#: ../src/startup.c:195 #, c-format msgid "internal X error: %s\n" msgstr "X 內部錯誤: %s\n" -#: ../src/startup.c:267 -#, c-format -msgid "got signal %i (%s) - restarting\n" -msgstr "收到訊號 %i (%s) - 重新啟動\n" - -#: ../src/startup.c:269 -#, c-format -msgid "got signal %i - restarting\n" -msgstr "收到訊號 %i - 重新啟動\n" - -#: ../src/startup.c:283 -#, c-format -msgid "got signal %i (%s) - rereading defaults\n" -msgstr "收到訊號 %i (%s) - 重讀預設值\n" - -#: ../src/startup.c:285 -#, c-format -msgid "got signal %i - rereading defaults\n" -msgstr "收到訊號 %i - 重讀預設值\n" - -#: ../src/startup.c:299 -#, c-format -msgid "got signal %i (%s) - exiting...\n" -msgstr "收到訊號 %i (%s) - 離開中...\n" - -#: ../src/startup.c:301 -#, c-format -msgid "got signal %i - exiting...\n" -msgstr "收到訊號 %i - 離開中...\n" - -#: ../src/startup.c:314 -#, c-format -msgid "got signal %i (%s)\n" -msgstr "收到訊號 %i (%s)\n" - -#: ../src/startup.c:316 -#, c-format -msgid "got signal %i\n" -msgstr "收到訊號 %i\n" - -#: ../src/startup.c:327 -msgid "" -"crashed while trying to do some post-crash cleanup. Aborting immediatelly." -msgstr "嘗試崩潰後清除處理時崩潰。直接放棄。" - -#. we try to restart Window Maker -#: ../src/startup.c:361 -msgid "trying to restart Window Maker..." -msgstr "嘗試重新啟動 Window Maker..." - -#: ../src/startup.c:366 -msgid "trying to start alternate window manager..." -msgstr "嘗試啟動另一套視窗管理員..." - -#: ../src/startup.c:371 -msgid "failed to start alternate window manager. Aborting." -msgstr "另一套視窗管理員啟動失敗。放棄中。" - -#: ../src/startup.c:373 -msgid "" -"a fatal error has occured, probably due to a bug. Please fill the included " -"BUGFORM and report it." -msgstr "發生嚴重錯誤，可能因為程式錯誤。請填寫 BUGFORM 並提出報告。" - -#: ../src/startup.c:857 +#: ../src/startup.c:772 #, c-format msgid "icon size is configured to %i, but it's too small. Using 16, instead\n" msgstr "圖示大小設為 %i 太小。改用 16\n" -#: ../src/startup.c:885 +#: ../src/startup.c:801 msgid "XKB is not supported. KbdModeLock is automatically disabled." -msgstr "" +msgstr "未支援 XKB。 KbdModeLock 自動失效。" -#: ../src/startup.c:904 +#: ../src/startup.c:820 msgid "it seems that there is already a window manager running" msgstr "似乎已經有視窗管理員在執行中" -#: ../src/startup.c:910 +#: ../src/startup.c:826 #, c-format msgid "could not manage screen %i" msgstr "無法管理螢幕 %i" -#: ../src/startup.c:971 +#: ../src/startup.c:885 msgid "could not manage any screen" msgstr "無法管理任何螢幕" -#: ../src/switchmenu.c:114 +#: ../src/switchmenu.c:145 msgid "Windows" msgstr "視窗" @@ -1388,28 +1359,27 @@ #: ../src/texture.c:437 #, c-format msgid "library \"%s\" cound not be opened." -msgstr "" +msgstr "無法開啟函式庫 \"%s\"。" #: ../src/texture.c:446 #, c-format msgid "function \"%s\" not found in library \"%s\"" -msgstr "" +msgstr "在函式庫 \"%2$s\" 找不到函式 \"%1$s\"" #: ../src/texture.c:453 msgid "function textures not supported on this system, sorry." -msgstr "" +msgstr "此系統不支援材質功能，抱歉。" #: ../src/texture.c:598 -#, fuzzy msgid "could not allocate image buffer" -msgstr "無法載入影像檔" +msgstr "無法配置影像緩衝區" -#: ../src/wdefaults.c:429 +#: ../src/wdefaults.c:437 #, c-format msgid "could not find icon file \"%s\"" msgstr "無法找到圖示檔 \"%s\"" -#: ../src/window.c:2741 ../src/window.c:2876 +#: ../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." @@ -1417,7 +1387,7 @@ "NumLock, ScrollLock 或類似的鍵似乎被打開。\n" "關閉它否則一些滑鼠動作與鍵盤???會無法作用。" -#: ../src/winmenu.c:129 +#: ../src/winmenu.c:125 msgid "" "This will kill the application.\n" "Any unsaved changes will be lost.\n" @@ -1427,19 +1397,19 @@ "任何未儲存的改變將會遺失。\n" "請確認。" -#: ../src/winmenu.c:278 ../src/winmenu.c:286 +#: ../src/winmenu.c:268 ../src/winmenu.c:277 msgid "Set Shortcut" msgstr "設定捷徑" -#: ../src/winmenu.c:364 ../src/winmenu.c:409 +#: ../src/winmenu.c:355 ../src/winmenu.c:400 msgid "could not create submenu for window menu" msgstr "無法為視窗選單建立副選單" -#: ../src/winmenu.c:413 +#: ../src/winmenu.c:404 msgid "Keep on top" msgstr "保持在最上層" -#: ../src/winmenu.c:418 +#: ../src/winmenu.c:409 msgid "Keep at bottom" msgstr "保持在最下層" @@ -1448,71 +1418,70 @@ #. * entries, you must update the command #defines in the top of #. * this file. #. -#: ../src/winmenu.c:446 ../src/winmenu.c:581 +#: ../src/winmenu.c:437 ../src/winmenu.c:571 msgid "Maximize" msgstr "最大化" -#: ../src/winmenu.c:454 ../src/winmenu.c:567 +#: ../src/winmenu.c:445 ../src/winmenu.c:557 msgid "Miniaturize" msgstr "最小化" -#: ../src/winmenu.c:463 ../src/winmenu.c:598 +#: ../src/winmenu.c:453 ../src/winmenu.c:588 msgid "Shade" msgstr "遮蔽" -#: ../src/winmenu.c:479 +#: ../src/winmenu.c:469 msgid "Resize/Move" msgstr "大小變更/移動" -#: ../src/winmenu.c:487 +#: ../src/winmenu.c:477 msgid "Select" msgstr "選取" -#: ../src/winmenu.c:495 +#: ../src/winmenu.c:485 msgid "Move To" msgstr "移至" -#: ../src/winmenu.c:500 +#: ../src/winmenu.c:490 msgid "Attributes..." msgstr "屬性..." -#: ../src/winmenu.c:502 +#: ../src/winmenu.c:492 msgid "Options" msgstr "選項" -#: ../src/winmenu.c:562 +#: ../src/winmenu.c:552 msgid "Deminiaturize" msgstr "取消最小化" -#: ../src/winmenu.c:576 +#: ../src/winmenu.c:566 msgid "Unmaximize" msgstr "取消最大化" -#: ../src/winmenu.c:593 +#: ../src/winmenu.c:583 msgid "Unshade" msgstr "取消遮蔽" -#: ../src/winspector.c:383 +#: ../src/winspector.c:392 #, c-format msgid "Could not find icon \"%s\" specified for this window" msgstr "無法找到指定給這個視窗的圖示 \"%s\"" -#: ../src/winspector.c:399 +#: ../src/winspector.c:409 #, c-format msgid "Could not open specified icon \"%s\":%s" msgstr "無法開啟指定的圖示 \"%s\":%s" -#: ../src/winspector.c:1122 +#: ../src/winspector.c:1129 #, c-format msgid "Inspecting %s.%s" -msgstr "" +msgstr "檢視 %s.%s" -#: ../src/winspector.c:1148 +#: ../src/winspector.c:1155 msgid "Click in the window you wish to inspect." -msgstr "" +msgstr "在你想檢視的視窗按一下。" -#: ../src/winspector.c:1187 -#, fuzzy +#: ../src/winspector.c:1194 msgid "" "The configuration will apply to all\n" "windows that have their WM_CLASS\n" @@ -1522,55 +1491,55 @@ "儲存時，設定值會套用至所有\n" "WM_CLASS 特性設為以上選取名稱的視窗。" -#: ../src/winspector.c:1216 +#: ../src/winspector.c:1223 msgid "Save" msgstr "儲存" -#: ../src/winspector.c:1224 +#: ../src/winspector.c:1231 msgid "Apply" msgstr "套用" -#: ../src/winspector.c:1230 +#: ../src/winspector.c:1237 msgid "Reload" msgstr "還原" -#: ../src/winspector.c:1239 ../src/winspector.c:1249 +#: ../src/winspector.c:1246 ../src/winspector.c:1256 msgid "Window Specification" msgstr "視窗規格" -#: ../src/winspector.c:1240 +#: ../src/winspector.c:1247 msgid "Window Attributes" msgstr "視窗屬性" -#: ../src/winspector.c:1241 +#: ../src/winspector.c:1248 msgid "Advanced Options" msgstr "進階選項" -#: ../src/winspector.c:1242 +#: ../src/winspector.c:1249 msgid "Icon and Initial Workspace" msgstr "圖示與啟始工作區" -#: ../src/winspector.c:1243 +#: ../src/winspector.c:1250 msgid "Application Specific" msgstr "應用程示特定" -#: ../src/winspector.c:1257 +#: ../src/winspector.c:1264 msgid "Defaults for all windows" msgstr "所有視窗預設值" -#: ../src/winspector.c:1311 -msgid "Select Window" +#: ../src/winspector.c:1318 +msgid "Select window" msgstr "選取視窗" -#: ../src/winspector.c:1325 +#: ../src/winspector.c:1332 msgid "Attributes" msgstr "屬性" -#: ../src/winspector.c:1336 -msgid "Disable Titlebar" +#: ../src/winspector.c:1343 +msgid "Disable titlebar" msgstr "使「標題列」失效" -#: ../src/winspector.c:1338 +#: ../src/winspector.c:1345 msgid "" "Remove the titlebar of this window.\n" "To access the window commands menu of a window\n" @@ -1578,258 +1547,390 @@ "equivalent shortcut, if you changed the default\n" "settings)." msgstr "" +"刪除此視窗的「標題列」。\n" +"要使用無「標題列」視窗的視窗命令選單，\n" +"按 Control+Esc (或同樣效果的捷徑，\n" +"如果你變更了預設設定)。" -#: ../src/winspector.c:1345 -msgid "Disable Resizebar" +#: ../src/winspector.c:1352 +msgid "Disable resizebar" msgstr "使「大小變更列」失效" -#: ../src/winspector.c:1347 +#: ../src/winspector.c:1354 msgid "Remove the resizebar of this window." -msgstr "" +msgstr "移除此視窗之「大小變更列」。" -#: ../src/winspector.c:1350 -msgid "Disable Close Button" +#: ../src/winspector.c:1357 +msgid "Disable close button" msgstr "使「關閉按鈕」失效" -#: ../src/winspector.c:1352 +#: ../src/winspector.c:1359 msgid "Remove the `close window' button of this window." -msgstr "" +msgstr "移除此視窗之「關閉按鈕」。" -#: ../src/winspector.c:1355 -msgid "Disable Miniaturize Button" +#: ../src/winspector.c:1362 +msgid "Disable miniaturize button" msgstr "使「最小化按鈕」失效" -#: ../src/winspector.c:1357 +#: ../src/winspector.c:1364 msgid "Remove the `miniaturize window' button of the window." -msgstr "" +msgstr "移除此視窗之「最小化按鈕」。" -#: ../src/winspector.c:1360 -#, fuzzy -msgid "Disable Border" -msgstr "使「大小變更列」失效" +#: ../src/winspector.c:1367 +msgid "Disable border" +msgstr "使「邊框」失效" -#: ../src/winspector.c:1362 +#: ../src/winspector.c:1369 msgid "Remove the 1 pixel black border around the window." -msgstr "" +msgstr "移除此視窗周圍一個像素黑框。" -#: ../src/winspector.c:1365 -msgid "Keep on Top / Floating" -msgstr "保持在最上層 / 漂浮" +#: ../src/winspector.c:1372 +msgid "Keep on top (floating)" +msgstr "保持在最上層 (漂浮)" -#: ../src/winspector.c:1367 +#: ../src/winspector.c:1374 msgid "" "Keep the window over other windows, not allowing\n" "them to cover it." -msgstr "" +msgstr "保持視窗在所有其他視窗之上，不許它們覆蓋它。" -#: ../src/winspector.c:1371 -msgid "Keep at Bottom / Sunken" -msgstr "保持在最下層 / 下沉" +#: ../src/winspector.c:1378 +msgid "Keep at bottom (sunken)" +msgstr "保持在最下層 (下沉)" -#: ../src/winspector.c:1373 +#: ../src/winspector.c:1380 msgid "Keep the window under all other windows." -msgstr "" +msgstr "保持視窗在所有其他視窗之下。" -#: ../src/winspector.c:1378 -msgid "Make window occupy all workspaces." -msgstr "" +#: ../src/winspector.c:1385 +msgid "Make window present in all workspaces." +msgstr "使視窗出現在所有工作區。" -#: ../src/winspector.c:1381 -msgid "Start Miniaturized" +#: ../src/winspector.c:1388 +msgid "Start miniaturized" msgstr "啟動時最小化" -#: ../src/winspector.c:1383 +#: ../src/winspector.c:1390 msgid "" "Make the window be automatically miniaturized when it's\n" "first shown." msgstr "" +"使視窗第一次顯示時自動最小化。" -#: ../src/winspector.c:1387 -msgid "Start Maximized" +#: ../src/winspector.c:1394 +msgid "Start maximized" msgstr "啟動時最大化" -#: ../src/winspector.c:1389 +#: ../src/winspector.c:1396 msgid "" "Make the window be automatically maximized when it's\n" "first shown." msgstr "" +"使視窗第一次顯示時自動最大化。" -#: ../src/winspector.c:1393 -msgid "Skip Window List" -msgstr "略過視窗清單" +#: ../src/winspector.c:1400 +msgid "Full screen maximization" +msgstr "全螢幕最大化" -#: ../src/winspector.c:1395 -msgid "Do not list the window in the window list menu." +#: ../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 "" +"使視窗最大化時使用整個螢幕空間。\n" +"「標題列」和「大小變更列」會被移至螢幕外。" -#: ../src/winspector.c:1410 +#: ../src/winspector.c:1419 msgid "Advanced" msgstr "進階" -#: ../src/winspector.c:1427 -msgid "Ignore HideOthers" -msgstr "忽略「隱藏其他」" - -#: ../src/winspector.c:1429 -msgid "" -"Do not hide the window when issuing the\n" -"`HideOthers' command." -msgstr "" - -#: ../src/winspector.c:1433 -msgid "Don't Bind Keyboard Shortcuts" +#: ../src/winspector.c:1436 +msgid "Do not bind keyboard shortcuts" msgstr "不要結合鍵盤捷徑" -#: ../src/winspector.c:1435 +#: ../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 "" +"不要結合鍵盤捷徑" +"當視窗取得焦點時不要從 Window Maker 結合鍵盤捷徑。\n" +"這會允許視窗接收所有按鍵組合，不管你的捷徑設定。" -#: ../src/winspector.c:1441 -msgid "Don't Bind Mouse Clicks" +#: ../src/winspector.c:1444 +msgid "Do not bind mouse clicks" msgstr "不要結合滑鼠按鍵" -#: ../src/winspector.c:1443 +#: ../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)." msgstr "" +"不要結合滑鼠動作，例如在視窗中按 `Alt'+拖曳滑鼠\n" +"(如果 alt 是你已設定的修正鍵)。" + +#: ../src/winspector.c:1451 +msgid "Do not show in the window list" +msgstr "不要顯示在視窗清單" + +#: ../src/winspector.c:1453 +msgid "Do not list the window in the window list menu." +msgstr "不要在視窗清單列出此視窗。" -#: ../src/winspector.c:1448 -msgid "Keep Inside Screen" +#: ../src/winspector.c:1456 +msgid "Do not let it take focus" +msgstr "不要讓它取得焦點" + +#: ../src/winspector.c:1458 +msgid "" +"Do not let the window take keyboard focus when you\n" +"click on it." +msgstr "" +"當你在視窗上按滑鼠時不要讓它取得焦點。" + +#: ../src/winspector.c:1462 +msgid "Keep inside screen" msgstr "保持在螢幕內" -#: ../src/winspector.c:1450 +#: ../src/winspector.c:1464 msgid "" "Do not allow the window to move itself completely\n" "outside the screen. For bug compatibility.\n" msgstr "" +"不允許視窗將它自己完全移出螢幕外。\n" +"為了錯誤相容性。\n" -#: ../src/winspector.c:1454 -msgid "Don't Let It Take Focus" -msgstr "不要讓它取得焦點" +#: ../src/winspector.c:1468 +msgid "Ignore 'Hide Others'" +msgstr "忽略「隱藏其他」" -#: ../src/winspector.c:1456 +#: ../src/winspector.c:1470 msgid "" -"Do not let the window take keyboard focus when you\n" -"click on it." +"Do not hide the window when issuing the\n" +"`HideOthers' command." msgstr "" +"當發出「隱藏其他」時不隱藏視窗。" -#: ../src/winspector.c:1460 -msgid "Don't Save Session" -msgstr "不要儲存狀態" +#: ../src/winspector.c:1474 +msgid "Ignore 'Save Session'" +msgstr "忽略「儲存時段」" -#: ../src/winspector.c:1462 +#: ../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 "" +"不要在時段狀態中存相關應用程式，\n" +"如此它不會在 Window Maker 啟動時被一起重新啟動。" -#: ../src/winspector.c:1468 -msgid "Emulate Application Icon" +#: ../src/winspector.c:1482 +msgid "Emulate application icon" msgstr "模擬應用程式圖示" -#: ../src/winspector.c:1470 +#: ../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 "" +"使此視窗當作可提供 Window Maker\n" +"足夠資訊建立可停靠應用程式圖示的應用程式。" -#: ../src/winspector.c:1475 -msgid "Full Screen Maximization" -msgstr "" - -#: ../src/winspector.c:1477 -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 "" - -#: ../src/winspector.c:1483 -#, fuzzy -msgid "Disable Language Button" -msgstr "使「關閉按鈕」失效" +#: ../src/winspector.c:1490 +msgid "Disable language button" +msgstr "使「語言按鈕」失效" -#: ../src/winspector.c:1485 +#: ../src/winspector.c:1492 msgid "Remove the `toggle language' button of the window." -msgstr "" +msgstr "刪除視窗的「切換語言」按鈕。" -#: ../src/winspector.c:1502 +#: ../src/winspector.c:1509 msgid "Miniwindow Image" msgstr "迷你視窗影像" -#: ../src/winspector.c:1529 -msgid "Icon File Name:" +#: ../src/winspector.c:1536 +msgid "Icon filename:" msgstr "圖示檔名:" -#: ../src/winspector.c:1542 +#: ../src/winspector.c:1549 msgid "Ignore client supplied icon" msgstr "忽略程式提供的圖示" -#: ../src/winspector.c:1549 +#: ../src/winspector.c:1556 msgid "Initial Workspace" msgstr "啟始工作區" -#: ../src/winspector.c:1551 +#: ../src/winspector.c:1558 msgid "The workspace to place the window when it'sfirst shown." -msgstr "" +msgstr "當第一次顯示時放置視窗的工作區。" -#: ../src/winspector.c:1557 +#: ../src/winspector.c:1564 msgid "Nowhere in particular" msgstr "無特別指定" -#: ../src/winspector.c:1575 -msgid "Application Wide" -msgstr "整個應用程式" +#: ../src/winspector.c:1582 +msgid "Application Attributes" +msgstr "應用程式屬性" -#: ../src/winspector.c:1586 -msgid "Start Hidden" +#: ../src/winspector.c:1593 +msgid "Start hidden" msgstr "啟動時隱藏" -#: ../src/winspector.c:1588 +#: ../src/winspector.c:1595 msgid "Automatically hide application when it's started." -msgstr "" +msgstr "當啟動時自動隱藏應用程式。" -#: ../src/winspector.c:1591 -msgid "No Application Icon" +#: ../src/winspector.c:1598 +msgid "No application icon" msgstr "無應用程式圖示" -#: ../src/winspector.c:1593 +#: ../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 "" +"使應用程式的應用程式圖示失效。\n" +"注意，你將無法再停靠它，\n" +"且任何已停靠圖示將停止正常工作。" + +#: ../src/winspector.c:1606 +msgid "Shared application icon" +msgstr "共用的應用程式圖示" -#: ../src/workspace.c:110 ../src/workspace.c:111 ../src/workspace.c:893 +#: ../src/winspector.c:1608 +msgid "" +"Use a single shared application icon for all of\n" +"the instances of this application.\n" +msgstr "" +"使用單一共用應用程式圖示於\n" +"所有此應用程式的執行個體。\n" + +#: ../src/workspace.c:103 ../src/workspace.c:104 ../src/workspace.c:1306 #, c-format msgid "Workspace %i" msgstr "工作區 %i" -#: ../src/workspace.c:950 +#: ../src/workspace.c:1356 msgid "Workspaces" msgstr "工作區" -#: ../src/workspace.c:952 +#: ../src/workspace.c:1358 msgid "could not create Workspace menu" msgstr "無法建立工作區選單" -#: ../src/workspace.c:959 +#: ../src/workspace.c:1365 msgid "New" msgstr "新增工作區" -#: ../src/workspace.c:960 +#: ../src/workspace.c:1366 msgid "Destroy Last" msgstr "刪除最後的工作區" +#~ msgid "unable to get dropped data from DND drop" +#~ msgstr "無法從 DND 放置取得放置資料" + +#~ msgid "error getting dropped data from DND drop" +#~ msgstr "從 DND 放置取得放置資料錯誤" + +#~ msgid "out of memory while getting data from DND drop" +#~ msgstr "從 DND 放置取得資料時記憶體不足" + +#~ msgid "unterminated string" +#~ msgstr "字串未終止" + +#~ msgid "unterminated array" +#~ msgstr "陣列未終止" + +#~ msgid "missing , in array or unterminated array" +#~ msgstr "在陣列缺少 , 或陣列未終止" + +#~ msgid "could not get array element" +#~ msgstr "無法取得陣列元素" + +#~ msgid "unterminated dictionary" +#~ msgstr "字點未終止" + +#~ msgid "missing dictionary key" +#~ msgstr "缺少字典鍵" + +#~ msgid "missing dictionary entry key or unterminated dictionary" +#~ msgstr "缺少字典記錄鍵或字典未中止" + +#~ msgid "error parsing dictionary key" +#~ msgstr "字典鍵解析錯誤" + +#~ msgid "missing = in dictionary entry" +#~ msgstr "字典記錄中缺少 = " + +#~ msgid "missing ; in dictionary entry" +#~ msgstr "字典記錄中缺少 ; " + +#~ msgid "" +#~ "was expecting a string, dictionary, data or array. If it's a string, try " +#~ "enclosing it with \"." +#~ msgstr "要求字串，字典，資料或陣列。如果是字串，請用 \" 號括起來。" + +#~ msgid "Comments are not allowed inside WindowMaker owned domain files." +#~ msgstr "在 WindowMaker 的定義域檔中不允許註解。" + +#~ msgid "could not open domain file %s" +#~ msgstr "無法開啟定義域檔 %s" + +#~ msgid "extra data after end of file" +#~ msgstr "檔案結束後有額外資料" + +#~ msgid "error making logo image for panel:%s" +#~ msgstr "面板的標識影像產生錯誤: %s" + +#~ msgid "got signal %i (%s) - restarting\n" +#~ msgstr "收到訊號 %i (%s) - 重新啟動\n" + +#~ msgid "got signal %i - restarting\n" +#~ msgstr "收到訊號 %i - 重新啟動\n" + +#~ msgid "got signal %i (%s) - rereading defaults\n" +#~ msgstr "收到訊號 %i (%s) - 重讀預設值\n" + +#~ msgid "got signal %i - rereading defaults\n" +#~ msgstr "收到訊號 %i - 重讀預設值\n" + +#~ msgid "got signal %i (%s) - exiting...\n" +#~ msgstr "收到訊號 %i (%s) - 離開中...\n" + +#~ msgid "got signal %i - exiting...\n" +#~ msgstr "收到訊號 %i - 離開中...\n" + +#~ msgid "got signal %i (%s)\n" +#~ msgstr "收到訊號 %i (%s)\n" + +#~ msgid "got signal %i\n" +#~ msgstr "收到訊號 %i\n" + +#~ msgid "" +#~ "crashed while trying to do some post-crash cleanup. Aborting immediatelly." +#~ msgstr "嘗試崩潰後清除處理時崩潰。直接放棄。" + +#~ msgid "trying to restart Window Maker..." +#~ msgstr "嘗試重新啟動 Window Maker..." + +#~ msgid "trying to start alternate window manager..." +#~ msgstr "嘗試啟動另一套視窗管理員..." + +#~ msgid "failed to start alternate window manager. Aborting." +#~ msgstr "另一套視窗管理員啟動失敗。放棄中。" + +#~ msgid "" +#~ "a fatal error has occured, probably due to a bug. Please fill the " +#~ "included BUGFORM and report it." +#~ msgstr "發生嚴重錯誤，可能因為程式錯誤。請填寫 BUGFORM 並提出報告。" + #~ msgid "Keep Attracted Icons" #~ msgstr "保持吸引的圖示" diff -Naur WindowMaker-0.91.0/README.es wm/README.es --- WindowMaker-0.91.0/README.es 1970-01-01 03:00:00 +0300 +++ wm/README.es 2004-10-15 03:05:20 +0400 @@ -0,0 +1,345 @@ + + + + GNU Window Maker + X11 Window Manager + + + + + por + + Alfredo K. Kojima + + Dan Pascu + + ]d + + + Web/FTP Master + + Phillip Smith + + + + Felicitaciones! Ha adquirido un dispositivo + excelentsimo que le proporcionar miles de aos de uso sin + problemas, si no fuera porque indudablemente lo destruir a + travs de alguna maniobra estpida tpica de consumidor. Por + eso le pedimos por EL AMOR DE DIOS LEA ESTE MANUAL DEL + PROPIETARIO CUIDADOSAMENTE ANTES DE DESEMPAQUETAR EL + DISPOSITIVO. YA LO DESEMPAQUET, NO? LO DESEMPAQUET Y LO + ENCHUF Y LO ENCENDI Y TOQUETE LAS PERILLAS, Y AHORA SU + CHICO, EL MISMO CHICO QUE UNA VEZ METI UNA SALCHICHA EN SU + VIDEOCASETERA Y ACCION "AVANCE RPIDO", ESTE CHICO + TAMBIN EST TUOQUETEANDO LAS PERILLAS, CIERTO? Y RECIN + AHORA EST COMENZANDO A LEER LAS INSTRUCCIONES, CIERTO??? + NOSOTROS PODRAMOS SIMPLEMENTE ROMPER ESTOS DISPOSITIVOS EN LA + FBRICA ANTES DE DESPACHARLOS, SABE? + -- Dave Barry, "Lea Esto Primero!" + + +Descripcin +=========== + +Window Maker es el gestor de ventanas GNU para el Sistema de Ventanas X. Fue +diseado para emular la apariencia y funcionalidad de parte del GUI de NEXTSTEP(mr). +Procura ser relativamente rpido y pequeo, rico en caractersticas, fcil de configurar +y usar, con una simple y elegante apariencia sacada desde NEXTSTEP(mr). + +Window Maker fue diseado teniendo en mente la integracin con GNUstep y por eso +es el gestor de ventanas "oficial". Es tambin parte del proyecto GNU (www.gnu.org) +. Lea mas sobre GNUstep ms adelante en este archivo. + + +Pistas (informacin dada por las aplicaciones para integrarse bien con el gestor de +ventanas) para Motif(tm), OPEN LOOK(tm), KDE y GNOME tambin son soportados. +Entonces puede reemplazar cualquiera de los gestores de ventana para estos entornos +con Window Maker manteniendo la mayora, si no todo, de la funcionalidad del +gestor de ventanas nativo. + +Window Maker antes se llamaba WindowMaker. + +Window Maker no tiene relacin con Windowmaker, el software para +hacer ventanas y puertas. + + +Documentacin +============= + +Lea antes de preguntar. + +* Los archivos README distribuidos por todas partes del rbol de fuentes +contienen informacin relacionada al contenido en los directorios. + +* INSTALL tiene instrucciones de instalacin y algunos consejos cuando tenga +algn problema. Significa que debera leerlo antes de la instalacin. +No fue escrito solo para ocupar espacio en el paquete... + +* FAQ: Preguntas Frecuentes. LEALO!!! FAQ.I18N es para +preguntas relacionadas con la internacionalizacin. + +* NEWS: lista los cambios visibles por el usuario desde la versin anterior. +Lalo si est actualizando. + +* MIRRORS: algunos lugares alternativos donde puede obtener Window Maker, +incluyendo paquetes de Window Maker especficos para ciertas plataformas. + +* BUGFORM: uselo para enviar reportes de errores. Por favor uselo. + +* ChangeLog: que cambi desde la versin anterior? + +* BUGS: lista de errores conocidos. + +*** Tutorial + +Hay un tutorial mantenido por Georges Tarbouriech en: + +http://www.linuxfocus.org/~georges.t/ + +*** Gua del Usuario + +La Gua del Usuario de Window Maker puede ser bajada desde el ftp oficial +o por sitios web. +Puede tambin ser vista en formato HTML en: + +http://people.delphi.com/crc3419/WMUserGuide/index.htm + +La Gua del Usuario explica como usar Window Maker, los archivos de configuracin +y opciones. + +*** man pages + +Tipee "man wmaker" en el prompt del shell para obtener ayuda general sobre Window Maker. + + +Directorios y Archivos en el rbol de Fuentes +============================================= + +* Install es un script para configurar y compilar Window Maker de una forma +fcil (no es que la forma normal sea difcil, pero...). + +* AUTORES: los crditos + +* TODO: planes para el futuro. + +* contrib/ tiene algunos parches aportados que no estn soportados por Window Maker + porque entran en conflicto con la filosofa de diseo de los desarrolladores o por + alguna otra razn. + +* util/ tiene varios programas utilitarios. + +* WPrefs.app/ es el programa de configuracin. + +* src/wconfig.h posee opciones de compilacin que puede cambiar para + seleccionar algunas opciones/caracteristicas y otras cosas. + +* WINGs/ biblioteca widget para imitacin de NEXTSTEP. + +* wrlib/ biblioteca de procesamiento de imagen. + +* po/ posee catlogos de mensajes que son las versiones traducidas de los mensajes +mostrados por Window Maker. + +* docklib-x.x.tar.gz es una biblioteca para escribir dockapps. + +SOCORRO!!! +========== + +Hay una lista de correo para discutir sobre Window Maker en +wm-user@windowmaker.org. Para suscribirse, envie un mensaje que contenga: + + subscribe +en el tema del mensaje a wm-user-request@windowmaker.org + +Si tiene algun problema, pregunte aqu (despus de leer los docs, por supuesto). Es +ms probable que las personas de la lista sepan contestar sus preguntas +que nosotros. Para reportes de errores use el BUGFORM. + +Si tiene un problema con una versin precompilada de Window Maker +(rpm, deb etc), primero pregunte a la persona que hizo el paquete. + +NOTA IMPORTANTE: cuando pida ayuda (en la lista de correo o a los desarrolladores, +directamente) *siempre* envie informacin sobre el sistema que est usando. Puede +usar la seccin de informacin del sistema al final del BUGFORM como una gua. +Otra cosa: por favor no envie correo HTML. + +Tambin hay un canal de IRC #windowmaker en openprojects. nase aqu, +conecte su cliente de irc a irc.openprojects.net, irc.linux.com o algn otro +servidor de esa red. + +GNUstep +======= + +GNUStep es un completo sistema de desarrollo orientado a objetos, basado en la +especificacin OpenStep liberada por NeXT(tm) (ahora Apple(tm) y Sun(tm)). Ello +proveer todo lo que se necesita para producir aplicaciones multiplataforma, +orientadas a objetos, grficas (y no grficas); suministrando dentro de otras cosas, +bibliotecas base del sistema, una estructura de alto nivel para aplicaciones GUI que +usan un modelo de imagenes de tipo Display PostScript(tm) (DGS), objetos para acceso +a bases de datos relacionales, objetos distribuidos y un entorno de desarrollo grfico, +con herramientas como un modelador de interfaces, un sistema para administracin del +proyecto (central de proyecto) y otras herramientas. + +El sistema de desarrollo de GNUStep ser usado para crear un entorno de usuario, +con todo lo necesario para una completa interface grfica de usuario, tal como +un visualizador de archivos, editores de texto y otras aplicaciones. Note que el +entorno de usuario (o "entorno de escritorio") es solo un pequea parte de todo +el proyecto GNUStep y por lo tanto no "compite" con otros proyectos como KDE o GNOME, +simplemente porque son cosas completamente diferentes. + +Para ms informacin sobre el proyecto GNUStep, visite: http://www.gnustep.org y +http://gnustep.current.nu + + +Ejecutando multiples instancias de Window Maker +=============================================== + +No es una buena idea eejcutar ms de una instancia de Window Maker desde +el mismo usuario (ya que wmaker usar los mismos archivos de configuracin) +al mismo tiempo. Podra obtener un comportamiento inesperado cuando Window +Maker actualiza sus archivos de configuracin. + +Si de verdad desea hacer esto, intente ejecutar Window Maker con la opcin +de linea de comando --static ya que as no actualizar o cambiar ninguno de los +archivos de configuracin. + +Soporte para Sonido +=================== + +El sonido es soportado por los sistemas Linux y FreeBSD con el uso de +un mdulo distribuido separadamente llamado WSoundServer. Hay tambin +una herramienta de configuracion grfica para definir sus sonidos llamada +WSoundPref. +Puede bajar esto en: +http://shadowmere.student.utwente.nl/ + +Note que debe compilar Window Maker con el parmetro --enable-sound +y definir la opcin DisableSound a NO. + + +Ajuste de Rendimiento. +===================== +Si quiere disminuir el uso de memoria por parte de Window Maker y mejorar el +rendimiento, manteniendo una linda apariencia y buena funcionalidad, siga los +items de abajo: + +- use texturas slidas para todo, principalmente barras de ttulo y menes. + Si quiere un escritorio de aspecto lindo, use el estilo Tradicional. +- Apague NewStyle y Superfluous +- No una muchos atajos al men y mantenga solo los items esenciales en el men. +- Active DisableClip +- edite wconfig.h y desactive el NUMLOCK_HACK y lo mismo con las caractersticas + que no use (tenga en mente que algunos de los #defines podran no funcionar, + ya que ellos no estn completamente soportados). Asegrese de mantener siempre + Numlock y ScrollLock apagados. +- Active DisableAnimations. Puede tambin #undefine ANIMATIONS en wconfig.h +- quite las entradas por defecto IconPath y PixmapPath para contener solo las + rutas que en verdad tiene en su sistema. +- no use imgenes grandes en el fondo raz. +- quite el soporte para los formatos de imagen que no use. +- para reducir el uso de la memoria, desactive el cach de cono, definiendo + la variable de entorno RIMAGE_CACHE a 0. Si quiere aumentar el rendimiento + a expensas del uso de la memoria, defina este valor a un valor igual al + nmero de conos distintos que use. + +Control del Mouse por Teclado +============================= + +Muchas personas preguntan sobre agregar control por teclado al mouse, como +en fvwm, pero Window Maker no tendr tal caracterstica. La extensin XKB +soporta simulacin de mouse desde el teclado, de una manera mucho ms poderosa +que cualquier otra simulacin hecha por un administrador de ventanas. + +Para activarlo, presione la combinacin de teclas Control+Shift+NumLock o +Shift+NumLock. Debiera escuchar el beep del parlante. Para desactivarlo, +haga lo mismo. + +Para controlar el mouse el teclado numrico se usa as: +- 4 (flecha izquierda), 7 (Home), 8 (flecha arriba), 9 (PgUP), 6 (flecha derecha), + 3 (PgDn), 2 (flecha abajo) y 1 (Fin) mueve el mouse a la correspondiente + direccin; +- sosteniendo una de las teclas de arriba y luego sosteniendo la tecla 5 mover +el puntero ms rpido; +- / seleccionar el primer botn del mouse (botn izquierdo); +- * seleccionar el segundo botn del mouse (botn del medio); +- - seleccionar el tercer botn del mouse (botn derecho); +- 5 har un click con el botn actualmente seleccionado del mouse; +- + har un doble click con el botn actualmente seleccionado; +- 0 (Ins) cliquear y mantendr el botn seleccionado actualmente; +- . (Del) liberar el botn seleccionado actualmente que fue anteriormente + cliqueado con la tecla 0 (Ins). + +Los valores anteriores de las teclas funcionarn en un servidor X XFree86 3.2 +(X11R6.1) pero su alcance puede variar. + +Como hacer un gdb backtrace +=========================== + +Backtraces pueden ayudarnos a arreglar errores que hicieron que Window Maker falle. +Si encuentra un bug que hace fallar a Window Maker, por favor envie un backtrace con su +reporte de error. + +Para hacer un backtrace til, necesita un archivo core con informacin de depuracin +producida por Window Maker cuando fall. Debera haber sido instalado sin stripping tambin. + +Para compilar wmaker con informacin de depuracin: + +./configure +make CFLAGS=-g + +Si obtiene el cuadro de dilogo que le dice que wmaker fall y le +pregunta que hacer, respndale "Abortar y dejar un archivo core" + +script +cd src +gdb .libs/wmaker path_to_the_core_file + +Luego, en el prompt gdb escriba "bt". Salga de gdb escribiendo "quit" +y luego, en el prompt del shell, scriba "exit" + +El archivo llamado typescript contendr el backtrace. + +Derechos de Autor y Descargo de Responsabilidad +=============================================== + +Window Maker est registrado por Alfredo K. Kojima y est licensiado por la +Licensia Pblica General GNU. Lea el archivo COPYING para leer la licensia +completa. + +Los conos que son distribuidos con este programa y fueron hechos por Marco +van Hylckama Vlieg, estn licenciados por la Licencia Pblica General GNU. +Lea el archivo COPYING para leer la licencia completa. + +Los conos listados en COPYING.WTFPL y son distribuidos en este programa +fueron hechos por Banlu Kemiyatorn (]d), estn licenciados por la +"do What The Fuck you want to Public License". Lea el archivo COPYING.WTFPL +para leer la licencia completa. + +NeXT, OpenStep y NEXTSTEP son marcas registradas de NeXT Computer, Inc. +Todas las otras marcas registradas son propiedad de sus respectivos dueos. + +Los autores se reservan el derecho de hacer cambios en el software sin previo +aviso. + +Autores +======= + +Alfredo K. Kojima +Dan Pascu +]d + +Por favor no nos haga preguntas antes de leer la documentacin (especialmente +la FAQ, este archivo y los archivos INSTALL) y sobre cosas "cool" que ve en +las capturas de pantalla del escritorio de las personas. + +El archivo AUTHORS contiene una lista de las personas que han contribuido +con el proyecto. El nombre de las personas que han ayudado con localization +(traduccin) se puede encontrar en po/README y Window Maker/README + +Si tiene algn comentario, arreglos y reportes de errores (complete BUGFORMs) +y envimelos a developers@windowmaker.org + + + +traducido por Efran Maximiliano Palermo diff -Naur WindowMaker-0.91.0/src/actions.c wm/src/actions.c --- WindowMaker-0.91.0/src/actions.c 2004-10-23 03:58:59 +0400 +++ wm/src/actions.c 2005-05-15 20:45:02 +0400 @@ -474,7 +474,7 @@ void wUnmaximizeWindow(WWindow *wwin) { - int restore_x, restore_y; + int x, y, w, h; if (!wwin->flags.maximized) return; @@ -483,13 +483,17 @@ wwin->flags.skip_next_animation = 1; wUnshadeWindow(wwin); } - restore_x = (wwin->flags.maximized & MAX_HORIZONTAL) ? + x = ((wwin->flags.maximized & MAX_HORIZONTAL) && wwin->old_geometry.x) ? wwin->old_geometry.x : wwin->frame_x; - restore_y = (wwin->flags.maximized & MAX_VERTICAL) ? + y = ((wwin->flags.maximized & MAX_VERTICAL) && wwin->old_geometry.y) ? wwin->old_geometry.y : wwin->frame_y; + w = wwin->old_geometry.width ? + wwin->old_geometry.width : wwin->client.width; + h = wwin->old_geometry.height ? + wwin->old_geometry.height : wwin->client.height; + wwin->flags.maximized = 0; - wWindowConfigure(wwin, restore_x, restore_y, - wwin->old_geometry.width, wwin->old_geometry.height); + wWindowConfigure(wwin, x, y, w, h); WMPostNotificationName(WMNChangedState, wwin, "maximize"); @@ -771,6 +775,7 @@ } k = (hiding ? 2 : 3); + switch(style) { case WIS_TWIST: steps = (MINIATURIZE_ANIMATION_STEPS_T * k)/3; @@ -1343,6 +1348,7 @@ WScreen *scr; WWindow *wlist; int hadfocus; + int animate; if (!wapp) { wwarning("trying to hide a non grouped window"); @@ -1362,15 +1368,19 @@ wapp->last_focused = wlist; else wapp->last_focused = NULL; + + animate = !wapp->flags.skip_next_animation; + while (wlist) { if (wlist->main_window == wapp->main_window) { if (wlist->flags.focused) { hadfocus = 1; } - if (wapp->app_icon) + if (wapp->app_icon) { hideWindow(wapp->app_icon->icon, wapp->app_icon->x_pos, - wapp->app_icon->y_pos, wlist, - !wapp->flags.skip_next_animation); + wapp->app_icon->y_pos, wlist, animate); + animate = False; + } } wlist = wlist->prev; } @@ -1449,6 +1459,7 @@ WWindow *wlist, *next; WWindow *focused=NULL; Bool shouldArrangeIcons = False; + int animate; if (!wapp) return; @@ -1462,6 +1473,8 @@ while (wlist->prev) wlist = wlist->prev; + animate = !wapp->flags.skip_next_animation; + while (wlist) { next = wlist->next; @@ -1502,9 +1515,9 @@ WMPostNotificationName(WMNChangedState, wlist, "hide"); } else if (wlist->flags.hidden) { unhideWindow(wapp->app_icon->icon, wapp->app_icon->x_pos, - wapp->app_icon->y_pos, wlist, - !wapp->flags.skip_next_animation, + wapp->app_icon->y_pos, wlist, animate, bringToCurrentWS); + animate = False; } else { if (bringToCurrentWS && wlist->frame->workspace != scr->current_workspace) { diff -Naur WindowMaker-0.91.0/src/application.c wm/src/application.c --- WindowMaker-0.91.0/src/application.c 2004-10-23 07:51:47 +0400 +++ wm/src/application.c 2005-03-11 04:59:55 +0300 @@ -400,7 +400,7 @@ /* If the icon was saved by us from the client supplied icon, but is * missing, recreate it. */ - if (tmp && strstr(tmp, ".AppInfo/WindowMaker")!=NULL && + if (tmp && strstr(tmp, "Library/WindowMaker/CachedPixmaps")!=NULL && stat(tmp, &dummy)!=0 && errno==ENOENT) { wmessage(_("recreating missing icon '%s'"), tmp); path = wIconStore(wapp->app_icon->icon); diff -Naur WindowMaker-0.91.0/src/client.c wm/src/client.c --- WindowMaker-0.91.0/src/client.c 2004-10-17 02:16:21 +0400 +++ wm/src/client.c 2005-03-13 03:15:13 +0300 @@ -239,19 +239,23 @@ /* If the window is shaded, wrong height will be set for the window */ if (xcre->value_mask & CWX) { nx = xcre->x; - if (HAS_BORDER(wwin)) + /* Subtracting the border makes the window shift by 1 pixel -Dan */ + /*if (HAS_BORDER(wwin)) { nx -= FRAME_BORDER_WIDTH; - } - else + }*/ + } else { nx = wwin->frame_x; + } if (xcre->value_mask & CWY) { ny = xcre->y - ((ofs_y < 0) ? 0 : wwin->frame->top_width); - if (HAS_BORDER(wwin)) + /* Subtracting the border makes the window shift by 1 pixel -Dan */ + /*if (HAS_BORDER(wwin)) { ny -= FRAME_BORDER_WIDTH; - } - else + }*/ + } else { ny = wwin->frame_y; + } if (xcre->value_mask & CWWidth) nwidth = xcre->width; diff -Naur WindowMaker-0.91.0/src/config.h.in wm/src/config.h.in --- WindowMaker-0.91.0/src/config.h.in 2004-10-26 08:10:44 +0400 +++ wm/src/config.h.in 1970-01-01 03:00:00 +0300 @@ -1,246 +0,0 @@ -/* src/config.h.in. Generated from configure.ac by autoheader. */ - -/* define if processor is x86 (normally detected by configure) */ -#undef ASM_X86 - -/* define if processor is x86 with MMX(tm) support (normally autodetected by - configure) */ -#undef ASM_X86_MMX - -/* define to the path to cpp */ -#undef CPP_PATH - -/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP - systems. This function is required for `alloca.c' support on those systems. - */ -#undef CRAY_STACKSEG_END - -/* Define to 1 if using `alloca.c'. */ -#undef C_ALLOCA - -/* Define to 1 if you have `alloca', as a function or macro. */ -#undef HAVE_ALLOCA - -/* Define to 1 if you have and it should be used (not on Ultrix). - */ -#undef HAVE_ALLOCA_H - -/* Define to 1 if you have the `asprintf' function. */ -#undef HAVE_ASPRINTF - -/* Define to 1 if you have the `atexit' function. */ -#undef HAVE_ATEXIT - -/* define if you have vsnprintf with C99 semantics (set by configure) */ -#undef HAVE_C99_VSNPRINTF - -/* Define to 1 if you have the header file. */ -#undef HAVE_CTYPE_H - -/* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you - don't. */ -#undef HAVE_DECL_SYS_SIGLIST - -/* Define to 1 if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ -#undef HAVE_DOPRNT - -/* Define to 1 if you have the header file. */ -#undef HAVE_FCNTL_H - -/* Define to 1 if you have the `gethostname' function. */ -#undef HAVE_GETHOSTNAME - -/* define if you have then inet_aton function (set by configure) */ -#undef HAVE_INET_ATON - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBINTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIMITS_H - -/* Define to 1 if you have the `mallinfo' function. */ -#undef HAVE_MALLINFO - -/* Define to 1 if you have the header file. */ -#undef HAVE_MALLOC_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the `mkstemp' function. */ -#undef HAVE_MKSTEMP - -/* Define to 1 if you have the `poll' function. */ -#undef HAVE_POLL - -/* Define to 1 if you have the header file. */ -#undef HAVE_POLL_H - -/* Define to 1 if you have the `select' function. */ -#undef HAVE_SELECT - -/* Define to 1 if you have the `setsid' function. */ -#undef HAVE_SETSID - -/* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strcasecmp' function. */ -#undef HAVE_STRCASECMP - -/* Define to 1 if you have the `strerror' function. */ -#undef HAVE_STRERROR - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the `strncasecmp' function. */ -#undef HAVE_STRNCASECMP - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_IOCTL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have that is POSIX.1 compatible. */ -#undef HAVE_SYS_WAIT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `vasprintf' function. */ -#undef HAVE_VASPRINTF - -/* Define to 1 if you have the `vprintf' function. */ -#undef HAVE_VPRINTF - -/* Define to 1 if you have the `vsnprintf' function. */ -#undef HAVE_VSNPRINTF - -/* define if your X server has XConvertCase() (set by configure) */ -#undef HAVE_XCONVERTCASE - -/* define if your X server has XInternAtoms() (set by configure) */ -#undef HAVE_XINTERNATOMS - -/* Internationalization (I18N) support (set by configure) */ -#undef I18N - -/* define if you want the 'lite' version */ -#undef LITE - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* define an extra path for pixmaps (set by configure) */ -#undef PIXMAPDIR - -/* where shared data is stored (defined by configure) */ -#undef PKGDATADIR - -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - -/* define if you want support for shaped windows (set by configure) */ -#undef SHAPE - -/* define if you want support for the XINERAMA extension and are in Solaris - (set by configure) */ -#undef SOLARIS_XINERAMA - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown */ -#undef STACK_DIRECTION - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* where the configuration is stored (defined by configure) */ -#undef SYSCONFDIR - -/* Define to 1 if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - -/* define if you want user defined menus for applications */ -#undef USER_MENU - -/* define if GIF libraries are available (set by configure) */ -#undef USE_GIF - -/* define if JPEG libraries are available (set by configure) */ -#undef USE_JPEG - -/* define if PNG libraries are available (set by configure) */ -#undef USE_PNG - -/* define if TIFF libraries are available (set by configure) */ -#undef USE_TIFF - -/* define if XPM libraries are available (set by configure) */ -#undef USE_XPM - -/* Version number of package */ -#undef VERSION - -/* define if you want support for the XINERAMA extension (set by configure) */ -#undef XINERAMA - -/* whether XKB language MODELOCK should be enabled */ -#undef XKB_MODELOCK - -/* define if X's shared memory extension is available (set by configure) */ -#undef XSHM - -/* Define to 1 if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING - -/* define if you want support for X window's X_LOCALE (set by configure) */ -#undef X_LOCALE - -/* Define to empty if `const' does not conform to ANSI C. */ -#undef const diff -Naur WindowMaker-0.91.0/src/CVS/Entries wm/src/CVS/Entries --- WindowMaker-0.91.0/src/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/src/CVS/Entries 2005-05-17 22:43:30 +0400 @@ -0,0 +1,99 @@ +/.cvsignore/1.7/Wed Apr 2 11:37:11 2003// +/GNUstep.h/1.11/Tue Oct 12 21:28:28 2004// +/Makefile.am/1.41/Fri Mar 11 21:59:06 2005// +/WindowMaker.h/1.62/Mon Oct 25 00:07:51 2004// +/actions.c/1.71/Sun May 15 16:45:02 2005// +/actions.h/1.10/Tue Oct 12 21:28:28 2004// +/appicon.c/1.50/Wed Oct 13 05:09:08 2004// +/appicon.h/1.12/Wed Oct 13 05:09:08 2004// +/application.c/1.31/Fri Mar 11 01:59:55 2005// +/application.h/1.10/Tue Oct 12 21:28:28 2004// +/appmenu.c/1.7/Tue Oct 12 21:28:28 2004// +/appmenu.h/1.5/Tue Oct 12 21:28:28 2004// +/balloon.c/1.17/Mon Apr 21 03:34:44 2003// +/balloon.h/1.5/Tue Oct 12 21:28:28 2004// +/client.c/1.43/Sun Mar 13 00:15:13 2005// +/client.h/1.5/Tue Oct 12 21:28:28 2004// +/colormap.c/1.8/Tue Oct 12 21:28:28 2004// +/cycling.c/1.28/Wed Oct 27 03:09:19 2004// +/def_pixmaps.h/1.6/Tue Oct 12 21:28:28 2004// +/defaults.c/1.98/Fri Apr 8 11:51:06 2005// +/defaults.h/1.8/Tue Oct 12 21:28:28 2004// +/dialog.c/1.81/Tue Mar 22 23:15:11 2005// +/dialog.h/1.10/Tue Oct 12 21:28:28 2004// +/dock.c/1.91/Sat Oct 23 03:30:04 2004// +/dock.h/1.17/Wed Oct 13 05:09:08 2004// +/dockedapp.c/1.23/Wed Oct 13 05:09:08 2004// +/event.c/1.99/Sun Oct 24 20:24:23 2004// +/extend_pixmaps.h/1.5/Tue Oct 12 21:28:28 2004// +/framewin.c/1.58/Thu Oct 14 23:05:20 2004// +/framewin.h/1.24/Thu Oct 14 23:05:20 2004// +/funcs.h/1.32/Thu Oct 14 18:04:18 2004// +/geomview.c/1.9/Wed Oct 20 06:11:30 2004// +/geomview.h/1.2/Tue Oct 12 21:28:28 2004// +/icon.c/1.29/Fri Mar 11 22:57:40 2005// +/icon.h/1.5/Tue Oct 12 21:28:28 2004// +/keybind.h/1.12/Tue Oct 12 21:28:28 2004// +/main.c/1.59/Mon Oct 25 02:23:41 2004// +/menu.c/1.68/Fri Mar 4 23:47:09 2005// +/menu.h/1.10/Tue Oct 12 21:28:28 2004// +/menureader.c/1.8/Tue Oct 12 21:28:28 2004// +/misc.c/1.53/Thu Nov 11 14:14:52 2004// +/monitor.c/1.10/Mon Oct 25 02:23:41 2004// +/motif.c/1.5/Tue Oct 12 21:28:28 2004// +/motif.h/1.6/Tue Oct 12 21:28:28 2004// +/moveres.c/1.63/Sun Oct 24 20:24:23 2004// +/pixmap.c/1.7/Tue Oct 12 21:28:28 2004// +/pixmap.h/1.5/Tue Oct 12 21:28:28 2004// +/placement.c/1.33/Fri Oct 22 23:39:11 2004// +/properties.c/1.14/Thu Oct 14 23:05:20 2004// +/properties.h/1.10/Tue Oct 12 21:28:28 2004// +/resources.c/1.9/Tue Oct 12 21:28:28 2004// +/resources.h/1.6/Tue Oct 12 21:28:28 2004// +/rootmenu.c/1.47/Fri Mar 4 23:47:09 2005// +/rootmenu.h/1.4/Tue Oct 12 21:28:28 2004// +/screen.c/1.68/Sun Oct 24 22:45:06 2004// +/screen.h/1.56/Fri Oct 22 23:39:11 2004// +/session.c/1.36/Fri Mar 11 01:59:55 2005// +/session.h/1.9/Tue Oct 12 21:28:28 2004// +/shutdown.c/1.20/Wed Mar 2 10:59:40 2005// +/stacking.c/1.18/Tue Oct 12 21:28:28 2004// +/stacking.h/1.6/Tue Oct 12 21:28:28 2004// +/startup.c/1.59/Wed Mar 2 10:59:40 2005// +/superfluous.c/1.26/Tue Oct 12 21:28:28 2004// +/superfluous.h/1.5/Tue Oct 12 21:28:28 2004// +/switchmenu.c/1.19/Tue Oct 19 02:37:58 2004// +/switchpanel.c/1.23/Sat Oct 30 07:17:49 2004// +/switchpanel.h/1.4/Wed Oct 20 03:31:14 2004// +/text.c/1.11/Tue Oct 12 21:28:28 2004// +/text.h/1.3/Tue Oct 12 21:28:28 2004// +/texture.c/1.18/Tue Oct 12 21:28:28 2004// +/texture.h/1.8/Tue Oct 12 21:28:28 2004// +/usermenu.c/1.14/Tue Oct 12 21:28:28 2004// +/usermenu.h/1.3/Tue Oct 12 21:28:28 2004// +/wconfig.h.in/1.83/Thu Nov 11 14:14:53 2004// +/wcore.c/1.9/Tue Oct 12 21:28:28 2004// +/wcore.h/1.6/Tue Oct 12 21:28:28 2004// +/wdefaults.c/1.24/Tue Oct 12 21:28:28 2004// +/wdefaults.h/1.5/Tue Oct 12 21:28:28 2004// +/window.c/1.118/Tue Mar 22 23:15:11 2005// +/window.h/1.36/Sat Oct 16 22:05:04 2004// +/winmenu.c/1.25/Thu Oct 21 00:59:52 2004// +/winspector.c/1.54/Fri Mar 4 23:47:09 2005// +/winspector.h/1.13/Tue Oct 12 21:28:28 2004// +/wmspec.c/1.13/Sun May 15 16:45:02 2005// +/wmspec.h/1.7/Sat Oct 16 22:05:04 2004// +/workspace.c/1.52/Tue Oct 26 03:03:02 2004// +/workspace.h/1.15/Sun Oct 24 22:45:06 2004// +/wsmap.c/1.1/Fri Mar 11 21:51:49 2005// +/wsound.c/1.3/Tue Oct 12 21:28:28 2004// +/wsound.h/1.2/Tue Oct 12 21:28:28 2004// +/xdnd.c/1.13/Fri Oct 22 23:39:11 2004// +/xdnd.h/1.2/Tue May 18 20:40:30 1999// +/xinerama.c/1.10/Sat Oct 23 03:30:04 2004// +/xinerama.h/1.7/Tue Oct 12 21:28:28 2004// +/xmodifier.c/1.5/Tue Oct 12 21:28:28 2004// +/xmodifier.h/1.2/Tue Oct 12 21:28:28 2004// +/xutil.c/1.10/Tue Oct 12 21:28:28 2004// +/xutil.h/1.1.1.1/Tue Sep 29 22:36:33 1998// +D diff -Naur WindowMaker-0.91.0/src/CVS/Repository wm/src/CVS/Repository --- WindowMaker-0.91.0/src/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/src/CVS/Repository 2005-05-17 22:43:27 +0400 @@ -0,0 +1 @@ +wm/src diff -Naur WindowMaker-0.91.0/src/CVS/Root wm/src/CVS/Root --- WindowMaker-0.91.0/src/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/src/CVS/Root 2005-05-17 22:43:27 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/src/.cvsignore wm/src/.cvsignore --- WindowMaker-0.91.0/src/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/src/.cvsignore 2003-04-02 15:37:11 +0400 @@ -0,0 +1,5 @@ +Makefile Makefile.in +config.h config.h.in wconfig.h stamp-h stamp-h1 stamp-h.in +.libs +wmaker +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/src/cycling.c wm/src/cycling.c --- WindowMaker-0.91.0/src/cycling.c 2004-10-25 05:48:39 +0400 +++ wm/src/cycling.c 2004-10-27 07:09:19 +0400 @@ -50,12 +50,15 @@ Window swwin= wSwitchPanelGetWindow(swpanel); if (wwin->flags.mapped) { - Window win[2]; + if (swwin!=None) { + Window win[2]; - win[0]= swwin; - win[1]= wwin->frame->core->window; + win[0]= swwin; + win[1]= wwin->frame->core->window; - XRestackWindows(dpy, win, 2); + XRestackWindows(dpy, win, 2); + } else + XRaiseWindow(dpy, wwin->frame->core->window); } } @@ -204,7 +207,8 @@ } } break; - + + case LeaveNotify: case MotionNotify: case ButtonRelease: { @@ -243,6 +247,9 @@ XUngrabKeyboard(dpy, CurrentTime); } + if (swpanel) + wSwitchPanelDestroy(swpanel); + if (newFocused) { wRaiseFrame(newFocused->frame->core); CommitStacking(scr); @@ -251,11 +258,6 @@ wSetFocusTo(scr, newFocused); } - if (!getenv("SWPDEBUG")) - { - if (swpanel) - wSwitchPanelDestroy(swpanel); - } scr->flags.doing_alt_tab = 0; if (somethingElse) diff -Naur WindowMaker-0.91.0/src/defaults.c wm/src/defaults.c --- WindowMaker-0.91.0/src/defaults.c 2004-10-26 05:13:50 +0400 +++ wm/src/defaults.c 2005-04-08 15:51:06 +0400 @@ -129,7 +129,7 @@ #ifdef NEWSTUFF static int getRImage(); #endif -static int getPLArray(); +static int getPropList(); /* value setting functions */ static int setJustify(); @@ -407,9 +407,6 @@ {"RaiseDelay", "0", NULL, &wPreferences.raise_delay, getInt, NULL }, - {"WindozeCycling", "NO", NULL, - &wPreferences.windows_cycling,getBool, NULL - }, {"CirculateRaise", "NO", NULL, &wPreferences.circ_raise, getBool, NULL }, @@ -662,8 +659,8 @@ {"IconTitleBack", "black", NULL, NULL, getColor, setIconTitleBack }, - {"SwitchPanelImages", "(\"swtile.png\")", &wPreferences, - NULL, getPLArray, setSwPOptions + {"SwitchPanelImages", "(swtile.png, swback.png, 30, 40)", &wPreferences, + NULL, getPropList, setSwPOptions }, /* keybindings */ #ifndef LITE @@ -974,6 +971,53 @@ #endif +/* Fixup paths for cached pixmaps from .AppInfo to Library/WindowMaker/... */ +static Bool +fixupCachedPixmapsPaths(WMPropList *dict) +{ + WMPropList *allApps, *app, *props, *iconkey, *icon, *newicon; + char *path, *fixedpath, *ptr, *search, *replace; + int i, len, slen; + Bool changed = False; + + search = "/.AppInfo/WindowMaker/"; + slen = strlen(search); + + iconkey = WMCreatePLString("Icon"); + allApps = WMGetPLDictionaryKeys(dict); + + for (i=0; i < WMGetPropListItemCount(allApps); i++) { + app = WMGetFromPLArray(allApps, i); + props = WMGetFromPLDictionary(dict, app); + if (!props) + continue; + icon = WMGetFromPLDictionary(props, iconkey); + if (icon && WMIsPLString(icon)) { + path = WMGetFromPLString(icon); + ptr = strstr(path, search); + if (ptr) { + changed = True; + len = (ptr - path); + fixedpath = wmalloc(strlen(path)+32); + strncpy(fixedpath, path, len); + fixedpath[len] = 0; + strcat(fixedpath, "/Library/WindowMaker/CachedPixmaps/"); + strcat(fixedpath, ptr+slen); + newicon = WMCreatePLString(fixedpath); + WMPutInPLDictionary(props, iconkey, newicon); + WMReleasePropList(newicon); + wfree(fixedpath); + } + } + } + + WMReleasePropList(allApps); + WMReleasePropList(iconkey); + + return changed; +} + + void wDefaultsMergeGlobalMenus(WDDomain *menuDomain) { @@ -1079,6 +1123,15 @@ wwarning(_("Domain %s (%s) of defaults database is corrupted!"), domain, the_path); } + if (strcmp(domain, "WMWindowAttributes")==0 && db->dictionary) { + if (fixupCachedPixmapsPaths(db->dictionary)) { + WMWritePropListToFile(db->dictionary, db->path, True); + /* re-read the timestamp. if this fails take current time */ + if (stat(db->path, &stbuf)<0) { + stbuf.st_mtime = time(NULL); + } + } + } db->timestamp = stbuf.st_mtime; } else { wwarning(_("could not load domain %s from user defaults database"), @@ -1708,15 +1761,9 @@ static int -getPLArray(WScreen *scr, WDefaultEntry *entry, WMPropList *value, void *addr, +getPropList(WScreen *scr, WDefaultEntry *entry, WMPropList *value, void *addr, void **ret) { - if (!WMIsPLArray(value)) { - wwarning(_("Wrong value for key \"%s\". Should be an array."), - entry->key); - return False; - } - WMRetainPropList(value); *ret= value; @@ -2494,7 +2541,7 @@ *k = 0; mod = wXModifierFromKey(b); if (mod<0) { - wwarning(_("%s:invalid key modifier \"%s\""), entry->key, b); + wwarning(_("%s: invalid key modifier \"%s\""), entry->key, b); return False; } shortcut.modifier |= mod; @@ -3535,6 +3582,14 @@ int cwidth, cheight; WPreferences *prefs= (WPreferences*)foo; + if (!WMIsPLArray(array) || WMGetPropListItemCount(array)==0) { + if (prefs->swtileImage) RReleaseImage(prefs->swtileImage); + prefs->swtileImage= NULL; + + WMReleasePropList(array); + return 0; + } + switch (WMGetPropListItemCount(array)) { case 4: diff -Naur WindowMaker-0.91.0/src/dialog.c wm/src/dialog.c --- WindowMaker-0.91.0/src/dialog.c 2004-10-25 05:48:19 +0400 +++ wm/src/dialog.c 2005-03-23 02:15:11 +0300 @@ -862,8 +862,8 @@ #define COPYRIGHT_TEXT \ - "Copyright \xc2\xa9 1997-2004 Alfredo K. Kojima\n"\ - "Copyright \xc2\xa9 1998-2004 Dan Pascu" + "Copyright \xc2\xa9 1997-2005 Alfredo K. Kojima\n"\ + "Copyright \xc2\xa9 1998-2005 Dan Pascu" @@ -1124,7 +1124,8 @@ "WHAT YOU SAY??", "SOMEBODY SET UP US THE BOMB", "ALL YOUR BASE ARE BELONG TO US!", - "Oh My God!!! Larry is back!" + "Oh My God!!! Larry is back!", + "Alex Perez is aliveeeeeeee!!!" }; diff -Naur WindowMaker-0.91.0/src/icon.c wm/src/icon.c --- WindowMaker-0.91.0/src/icon.c 2004-10-17 02:16:21 +0400 +++ wm/src/icon.c 2005-03-12 01:57:40 +0300 @@ -496,7 +496,7 @@ prefix = wusergnusteppath(); len = strlen(prefix)+64+strlen(suffix); path = wmalloc(len+1); - snprintf(path, len, "%s/.AppInfo", prefix); + snprintf(path, len, "%s/Library/WindowMaker", prefix); if (access(path, F_OK)!=0) { if (mkdir(path, S_IRUSR|S_IWUSR|S_IXUSR)) { @@ -506,7 +506,7 @@ return NULL; } } - strcat(path, "/WindowMaker"); + strcat(path, "/CachedPixmaps"); if (access(path, F_OK)!=0) { if (mkdir(path, S_IRUSR|S_IWUSR|S_IXUSR)!=0) { wsyserror(_("could not create directory %s"), path); @@ -527,7 +527,7 @@ /* * wIconStore-- - * Stores the client supplied icon at ~/GNUstep/.AppInfo/WindowMaker + * Stores the client supplied icon at ~/GNUstep/Library/WindowMaker/CachedPixmaps * and returns the path for that icon. Returns NULL if there is no * client supplied icon or on failure. * diff -Naur WindowMaker-0.91.0/src/Makefile.am wm/src/Makefile.am --- WindowMaker-0.91.0/src/Makefile.am 2004-10-23 07:45:28 +0400 +++ wm/src/Makefile.am 2005-03-12 00:59:06 +0300 @@ -4,8 +4,11 @@ bin_PROGRAMS = wmaker +#noinst_PROGRAMS = wsmap + EXTRA_DIST = +#wsmap_SOURCES= wsmap.c wmaker_SOURCES = \ GNUstep.h \ @@ -121,3 +124,11 @@ @INTLIBS@ \ @DLLIBS@ +#wsmap_LDADD = \ +# $(top_builddir)/WINGs/libWINGs.a\ +# $(top_builddir)/wrlib/libwraster.la\ +# @XFTLIBS@ \ +# @XLIBS@ \ +# @INTLIBS@ \ +# @DLLIBS@ + diff -Naur WindowMaker-0.91.0/src/Makefile.in wm/src/Makefile.in --- WindowMaker-0.91.0/src/Makefile.in 2004-10-26 08:10:46 +0400 +++ wm/src/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,423 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -AUTOMAKE_OPTIONS = no-dependencies - -BUILT_SOURCES = wconfig.h - -bin_PROGRAMS = wmaker - -EXTRA_DIST = - -wmaker_SOURCES = GNUstep.h WindowMaker.h actions.c actions.h appicon.c appicon.h application.c application.h appmenu.c appmenu.h balloon.c balloon.h client.c client.h colormap.c cycling.c def_pixmaps.h defaults.c defaults.h dialog.c dialog.h dock.c dockedapp.c dock.h event.c extend_pixmaps.h framewin.c framewin.h geomview.c geomview.h funcs.h icon.c icon.h keybind.h main.c menu.c menu.h misc.c monitor.c motif.c motif.h moveres.c pixmap.c pixmap.h placement.c properties.c properties.h resources.c resources.h rootmenu.c screen.c screen.h session.h session.c shutdown.c switchpanel.c switchpanel.h stacking.c stacking.h startup.c superfluous.c superfluous.h switchmenu.c texture.c texture.h usermenu.c usermenu.h xdnd.h xdnd.c xinerama.h xinerama.c xmodifier.h xmodifier.c xutil.c xutil.h wconfig.h wcore.c wcore.h wdefaults.c wdefaults.h window.c window.h winmenu.c winspector.h winspector.c wmspec.h wmspec.c workspace.c workspace.h wsound.c wsound.h text.c text.h - - -AM_CPPFLAGS = $(DFLAGS) -DLOCALEDIR=\"$(NLSDIR)\" - -AM_CFLAGS = @NOSTRICTALIASING@ - -INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ - - -wmaker_LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la @XFTLIBS@ @XLIBS@ @INTLIBS@ @DLLIBS@ - -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = config.h -CONFIG_CLEAN_FILES = wconfig.h -bin_PROGRAMS = wmaker$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I. -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -wmaker_OBJECTS = actions.$(OBJEXT) appicon.$(OBJEXT) \ -application.$(OBJEXT) appmenu.$(OBJEXT) balloon.$(OBJEXT) \ -client.$(OBJEXT) colormap.$(OBJEXT) cycling.$(OBJEXT) \ -defaults.$(OBJEXT) dialog.$(OBJEXT) dock.$(OBJEXT) dockedapp.$(OBJEXT) \ -event.$(OBJEXT) framewin.$(OBJEXT) geomview.$(OBJEXT) icon.$(OBJEXT) \ -main.$(OBJEXT) menu.$(OBJEXT) misc.$(OBJEXT) monitor.$(OBJEXT) \ -motif.$(OBJEXT) moveres.$(OBJEXT) pixmap.$(OBJEXT) placement.$(OBJEXT) \ -properties.$(OBJEXT) resources.$(OBJEXT) rootmenu.$(OBJEXT) \ -screen.$(OBJEXT) session.$(OBJEXT) shutdown.$(OBJEXT) \ -switchpanel.$(OBJEXT) stacking.$(OBJEXT) startup.$(OBJEXT) \ -superfluous.$(OBJEXT) switchmenu.$(OBJEXT) texture.$(OBJEXT) \ -usermenu.$(OBJEXT) xdnd.$(OBJEXT) xinerama.$(OBJEXT) \ -xmodifier.$(OBJEXT) xutil.$(OBJEXT) wcore.$(OBJEXT) wdefaults.$(OBJEXT) \ -window.$(OBJEXT) winmenu.$(OBJEXT) winspector.$(OBJEXT) \ -wmspec.$(OBJEXT) workspace.$(OBJEXT) wsound.$(OBJEXT) text.$(OBJEXT) -wmaker_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a \ -$(top_builddir)/wrlib/libwraster.la -wmaker_LDFLAGS = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = ./stamp-h.in Makefile.am Makefile.in config.h.in \ -wconfig.h.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = $(wmaker_SOURCES) -OBJECTS = $(wmaker_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -config.h: stamp-h - @if test ! -f $@; then \ - rm -f stamp-h; \ - $(MAKE) stamp-h; \ - else :; fi -stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES= CONFIG_HEADERS=src/config.h \ - $(SHELL) ./config.status - @echo timestamp > stamp-h 2> /dev/null -$(srcdir)/config.h.in: $(srcdir)/stamp-h.in - @if test ! -f $@; then \ - rm -f $(srcdir)/stamp-h.in; \ - $(MAKE) $(srcdir)/stamp-h.in; \ - else :; fi -$(srcdir)/stamp-h.in: $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOHEADER) - @echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null - -mostlyclean-hdr: - -clean-hdr: - -distclean-hdr: - -rm -f config.h - -maintainer-clean-hdr: -wconfig.h: $(top_builddir)/config.status wconfig.h.in - cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -mostlyclean-binPROGRAMS: - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) - -distclean-binPROGRAMS: - -maintainer-clean-binPROGRAMS: - -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(bin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -wmaker$(EXEEXT): $(wmaker_OBJECTS) $(wmaker_DEPENDENCIES) - @rm -f wmaker$(EXEEXT) - $(LINK) $(wmaker_LDFLAGS) $(wmaker_OBJECTS) $(wmaker_LDADD) $(LIBS) - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = src - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -all-recursive-am: config.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - -install-exec-am: install-binPROGRAMS -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-binPROGRAMS -uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) config.h -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: - -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) -mostlyclean-am: mostlyclean-hdr mostlyclean-binPROGRAMS \ - mostlyclean-compile mostlyclean-libtool \ - mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-hdr clean-binPROGRAMS clean-compile clean-libtool \ - clean-tags clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-hdr distclean-binPROGRAMS distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-hdr maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ -mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/src/menu.c wm/src/menu.c --- WindowMaker-0.91.0/src/menu.c 2004-10-25 02:36:29 +0400 +++ wm/src/menu.c 2005-03-05 02:47:09 +0300 @@ -1074,6 +1074,9 @@ break; case XK_Return: +#ifdef XK_KP_Enter + case XK_KP_Enter: +#endif done = 2; break; @@ -2609,7 +2612,7 @@ #endif /* !LITE */ -#define COMPLAIN(key) wwarning(_("bad value in menus state info:%s"), key) +#define COMPLAIN(key) wwarning(_("bad value in menus state info: %s"), key) static Bool diff -Naur WindowMaker-0.91.0/src/menureader.c wm/src/menureader.c --- WindowMaker-0.91.0/src/menureader.c 1970-01-01 03:00:00 +0300 +++ wm/src/menureader.c 2004-10-13 01:28:28 +0400 @@ -0,0 +1,463 @@ +/* menureader.c- root menu definition readers + * + * Window Maker window manager + * + * Copyright (c) 2000-2003 Alfredo K. Kojima + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + + +#include +#include +#include +#include +#include + +#include "WindowMaker.h" + +#include "misc.h" + +#include "rootmenu.h" + + +typedef struct PLMenuReaderData { + WRootMenuReader *reader; + + WMPropList *pl; + int curIndex; + + WMPropList **submenu; + int *curSubIndex; + int submenuDepth; + +} PLMenuReaderData; + + +typedef struct TextMenuReaderData { + WRootMenuReader *reader; + + FILE *file; + +} TextMenuReaderData; + + +typedef struct PipeMenuReaderData { + WRootMenuReader *reader; + +} PipeMenuReaderData; + + +typedef struct DirMenuReaderData { + WRootMenuReader *reader; + + char **dirList; + int dirCount; + +} DirMenuReaderData; + +/* + typedef struct GNOMEMenuReaderData { + } GNOMEMenuReaderData; + */ + + + + + +static WRootMenuData *pl_openMenu(WMPropList *pl); +static Bool pl_hasMoreData(WRootMenuData *data); +static Bool pl_nextCommand(WRootMenuData *data, + char **title, + char **command, + char **parameter, + char **shortcut); +static void pl_closeMenuFile(WRootMenuData *data); + + + +static WRootMenuData *text_openMenuFile(char *path); +static Bool text_hasMoreData(WRootMenuData *data); +static Bool text_nextCommand(WRootMenuData *data, + char **title, + char **command, + char **parameter, + char **shortcut); +static void text_closeMenuFile(WRootMenuData *data); + + +static WRootMenuData *dir_openMenuFile(char *path); +static Bool dir_hasMoreData(WRootMenuData *data); +static Bool dir_nextCommand(WRootMenuData *data, + char **title, + char **command, + char **parameter, + char **shortcut); +static void dir_closeMenuFile(WRootMenuData *data); + + + + + + +static WRootMenuReader PLMenuReader = { + pl_hasMoreData, + pl_nextCommand, + pl_closeMenuFile +}; + +static WRootMenuReader TextMenuReader = { + text_hasMoreData, + text_nextCommand, + text_closeMenuFile +}; + +static WRootMenuReader DirMenuReaderData = { + dir_hasMoreData, + dir_nextCommand, + dir_closeMenuFile +}; + +/* + WRootMenuReader GNOMEMenuReaderData = { + }; + */ + + + + +#define LINESIZE 1024 + +static char linebuf[LINESIZE]; + + + +/* ---------- proplist ---------- */ + + +static WRootMenuData* +pl_openMenuFile(WMPropList *pl) +{ + PLRootMenuData *data = wmalloc(sizeof(PLRootMenuData)); + + data->reader = PLMenuReader; + + data->pl = pl; + data->curIndex = 0; + + data->submenu = NULL; + data->curSubIndex = NULL; + data->submenuDepth = 0; + + return data; +} + + +static Bool +pl_hasMoreData(WRootMenuData *data) +{ +} + + +static Bool +pl_nextCommand(WRootMenuData *data, char **title, char **command, + char **parameter, char **shortcut) +{ +} + + +static void +pl_closeMenuFile(WRootMenuData *data) +{ + if (data->submenu) + wfree(data->submenu); + if (data->curSubIndex) + wfree(data->curSubIndex); + + WMReleasePropList(data->pl); + + wfree(data); +} + + +/* ---------- text ---------- */ + + +static WRootMenuData* +text_openMenuFile(char *path) +{ + TextMenuReaderData *data; + + data = wmalloc(sizeof(TextMenuReaderData)); + data->reader = TextMenuReader; + + data->file = fopen(path, "rb"); + if (!data->file) { + + return NULL; + } +} + + +static Bool +text_hasMoreData(WRootMenuData *data) +{ +} + + +static Bool +text_nextCommand(WRootMenuData *data, char **title, char **command, + char **parameter, char **shortcut) +{ +} + + +static void +text_closeMenuFile(WRootMenuData *data) +{ +} + + +/* ---------- directory ---------- */ + + +static WRootMenuData* +dir_openMenuFile(char *paths, time_t *timestamp) +{ + DirMenuReaderData *data; + char **dirs; + int dirN; + time_t checksum = 0; + int i, c; + + /* timestamp for directory is a "checksum" of the directory times */ + + wtokensplit(paths, &dirs, &dirN); + + if (dirN == 0) { + return NULL; + } + + for (c = 0, i = 0; i < dirN; i++) { + char *tmp; + + if (strcmp(dirs[i], "-noext")==0) { + i++; + continue; + } + + tmp = wexpandpath(dirs[i]); + wfree(dirs[i]); + dirs[i] = tmp; + + if (stat(dirs[i], &stat_buf)<0) { + wsyserror(_("%s:could not stat menu"), dirs[i]); + wfree(dirs[i]); + dirs[i] = NULL; + } else { + c++; + checksum += stat_buf.st_mtime; + } + } + + if (*timestamp == checksum && *timestamp != 0) { + return NULL; + } + + if (c == 0) { + for (i = 0; i < dirN; i++) { + if (dirs[i]) + wfree(dirs[i]); + } + wfree(dirs); + + return NULL; + } + + data = wmalloc(sizeof(DirMenuReaderData)); + data->reader = DirMenuReader; + + + +} + + +static Bool +dir_hasMoreData(WRootMenuData *data) +{ +} + +static Bool +dir_nextCommand(WRootMenuData *data, char **title, char **command, + char **parameter, char **shortcut) +{ +} + +static void +dir_closeMenuFile(WRootMenuData *data) +{ +} + + +WRootMenuData* +OpenMenu(char *path, time_t *menuTime) +{ + proplist pl; + struct stat stat_buf; + WRootMenuData *data; + + /* check whether it's a piped menu */ + if (*path == '|') { + /* piped menus have the following semantics for menuTime: + * if it's 0, then it wasnt loaded yet + * if it's 1, it was already loaded, so do not reload + * (would be too slow) + * now, menuTime will only be set to 1 if the pipe command is + * specified as ||command instead of |command + * in other words ||command means force the submenu to always refresh + */ + if (*menuTime == 0) { + data = pipe_openMenu(path); + } + if (path[1] != '|') { + *menuTime = 1; + } + return data; + } + + if (stat(path, &stat_buf) < 0) { + wsyserror(_("could not stat() menu file '%s'")); + return NULL; + } + + /* check whether it's a directory */ + if (S_ISDIR(stat_buf.st_mode)) { + return dir_openMenuFile(path, menuTime); + } + + + if (*menuTime >= stat_buf.st_mtime && *menuTime != 0) { + /* no changes in the menu file */ + return NULL; + } + + /* then check whether it's a proplist menu */ + pl = WMReadPropListFromFile(path); + if (pl && WMIsPLArray(pl)) { + *menuTime = stat_buf.st_mtime; + return pl_openMenu(pl); + } + + *menuTime = stat_buf.st_mtime; + /* assume its a plain text menu */ + return text_openMenuFile(path); +} + + +WRootMenuData* +ReopenRootMenu(time_t *checkTime, char **menuPath, time_t *menuTimestamp) +{ + proplist pl; + struct stat stat_buf; + char *path; + + + if (stat(path, &stat_buf) < 0) { + wsyserror(_("could not stat() menu file '%s'")); + return NULL; + } + + if (*menuTime >= stat_buf.st_mtime && *checkTime != 0) { + /* no changes in WMRootMenu, see if the contents changed */ + if (*menuPath != NULL) { + return OpenMenu(*menuPath, menuTimestamp); + } else { + return NULL; + } + } + + *checkTime = stat_buf.st_mtime; + + pl = WMReadPropListFromFile(path); + if (!pl) { + wwarning(_("could not load domain %s from user defaults database"), + "WMRootMenu"); + return NULL; + } + + if (WMIsPLString(pl)) { + char *tmp; + char *path; + Bool menu_is_default = False; + + tmp = wexpandpath(WMGetFromPLString(pl)); + + path = getLocalizedMenuFile(tmp); + + if (!path) { + path = wfindfile(DEF_CONFIG_PATHS, tmp); + } + + if (!path) { + wwarning(_("could not find menu file '%s' referenced in WMRootMenu"), + tmp); + path = wfindfile(DEF_CONFIG_PATHS, DEF_MENU_FILE); + menu_is_default = True; + } + + if (!path) { + wwarning(_("could not find any usable menu files. Please check '%s'"), + tmp); + wfree(tmp); + return NULL; + } + + wfree(tmp); + + if (*menuPath) { + if (strcmp(*menuPath, path) != 0) { + *menuTimestamp = 0; + wfree(*menuPath); + *menuPath = path; + + if (menu_is_default) { + wwarning(_("using default menu file \"%s\" as the menu referenced in WMRootMenu could not be found "), + path); + } + } else { + /* the menu path didn't change, but the + * pointed file might have changed, so we don't return + */ + } + } else { + *menuPath = path; + } + + return OpenMenu(*menuPath, menuTimestamp); + } else if (WMIsPLArray(pl)) { + + *menuTimestamp = stat_buf.st_mtime; + + return pl_openMenu(pl); + } else { + wwarning(_("invalid content in menu file '%s'.\nIt should either be a property list menu or the path to the file, enclosed in \"."), + path); + return NULL; + } +} + + + diff -Naur WindowMaker-0.91.0/src/misc.c wm/src/misc.c --- WindowMaker-0.91.0/src/misc.c 2004-10-25 05:48:39 +0400 +++ wm/src/misc.c 2004-11-11 17:14:52 +0300 @@ -1215,10 +1215,12 @@ } +#define MAX_CMD_SIZE 4096 + Bool GetCommandForPid(int pid, char ***argv, int *argc) { - char buf[1024]; + static char buf[MAX_CMD_SIZE]; FILE *fPtr; int count, i, j; Bool ok= False; @@ -1226,9 +1228,9 @@ sprintf(buf, "/proc/%d/cmdline", pid); fPtr = fopen(buf, "r"); if (fPtr) { - count = read(fileno(fPtr), buf, 1024); + count = read(fileno(fPtr), buf, MAX_CMD_SIZE); if (count > 0) { - buf[count] = 0; + buf[count-1] = 0; for (i=0, *argc=0; i #include -#include #include "WindowMaker.h" #include "window.h" diff -Naur WindowMaker-0.91.0/src/stamp-h.in wm/src/stamp-h.in --- WindowMaker-0.91.0/src/stamp-h.in 2004-10-26 08:16:06 +0400 +++ wm/src/stamp-h.in 1970-01-01 03:00:00 +0300 @@ -1 +0,0 @@ -timestamp diff -Naur WindowMaker-0.91.0/src/startup.c wm/src/startup.c --- WindowMaker-0.91.0/src/startup.c 2004-10-25 05:28:02 +0400 +++ wm/src/startup.c 2005-03-02 13:59:40 +0300 @@ -34,7 +34,6 @@ #include #include -#include #include #include #include diff -Naur WindowMaker-0.91.0/src/switchpanel.c wm/src/switchpanel.c --- WindowMaker-0.91.0/src/switchpanel.c 2004-10-26 05:13:50 +0400 +++ wm/src/switchpanel.c 2004-10-30 11:17:49 +0400 @@ -25,12 +25,6 @@ #include #include -#ifdef SHAPE -#include - -extern Bool wShapeSupported; -#endif - #include "WindowMaker.h" #include "screen.h" #include "wcore.h" @@ -41,6 +35,13 @@ #include "funcs.h" #include "xinerama.h" +#ifdef SHAPE +#include + +extern Bool wShapeSupported; +#endif + + struct SwitchPanel { WScreen *scr; WMWindow *win; @@ -95,10 +96,10 @@ } -static void changeImage(WSwitchPanel *panel, int index, int selected) +static void changeImage(WSwitchPanel *panel, int idecks, int selected) { - WMFrame *icon = WMGetFromArray(panel->icons, index); - RImage *image= WMGetFromArray(panel->images, index); + WMFrame *icon = WMGetFromArray(panel->icons, idecks); + RImage *image= WMGetFromArray(panel->images, idecks); if (!panel->bg && !panel->tile) { if (!selected) @@ -112,7 +113,7 @@ WMPoint pos; Pixmap p; - if (canReceiveFocus(WMGetFromArray(panel->windows, index)) < 0) + if (canReceiveFocus(WMGetFromArray(panel->windows, idecks)) < 0) opaq= 50; pos= WMGetViewPosition(WMWidgetView(icon)); @@ -354,43 +355,51 @@ static void -drawTitle(WSwitchPanel *panel, int index, char *title) +drawTitle(WSwitchPanel *panel, int idecks, char *title) { char *ntitle; int width= WMWidgetWidth(panel->win); int x; - ntitle= ShrinkString(panel->font, title, width-2*BORDER_SPACE); + if (title) + ntitle= ShrinkString(panel->font, title, width-2*BORDER_SPACE); + else + ntitle= NULL; if (panel->bg) { - if (strcmp(ntitle, title)!=0) - x= BORDER_SPACE; - else - { - int w= WMWidthOfString(panel->font, ntitle, strlen(ntitle)); - - x= BORDER_SPACE+(index-panel->firstVisible)*ICON_TILE_SIZE + ICON_TILE_SIZE/2 - w/2; - if (x < BORDER_SPACE) + if (ntitle) { + if (strcmp(ntitle, title)!=0) x= BORDER_SPACE; - else if (x + w > width-BORDER_SPACE) - x= width-BORDER_SPACE-w; - } - + else + { + int w= WMWidthOfString(panel->font, ntitle, strlen(ntitle)); + + x= BORDER_SPACE+(idecks-panel->firstVisible)*ICON_TILE_SIZE + ICON_TILE_SIZE/2 - w/2; + if (x < BORDER_SPACE) + x= BORDER_SPACE; + else if (x + w > width-BORDER_SPACE) + x= width-BORDER_SPACE-w; + } + } XClearWindow(dpy, WMWidgetXID(panel->win)); - WMDrawString(panel->scr->wmscreen, - WMWidgetXID(panel->win), - panel->white, panel->font, - x, WMWidgetHeight(panel->win) - BORDER_SPACE - LABEL_HEIGHT + WMFontHeight(panel->font)/2, - ntitle, strlen(ntitle)); + if (ntitle) + WMDrawString(panel->scr->wmscreen, + WMWidgetXID(panel->win), + panel->white, panel->font, + x, WMWidgetHeight(panel->win) - BORDER_SPACE - LABEL_HEIGHT + WMFontHeight(panel->font)/2, + ntitle, strlen(ntitle)); } else { - WMSetLabelText(panel->label, ntitle); + if (ntitle) + WMSetLabelText(panel->label, ntitle); } - free(ntitle); + if (ntitle) + free(ntitle); } -static WMArray *makeWindowListArray(WScreen *scr, WWindow *curwin, int workspace) +static WMArray *makeWindowListArray(WScreen *scr, WWindow *curwin, int workspace, + int include_unmapped) { WMArray *windows= WMCreateArray(10); int fl; @@ -399,7 +408,8 @@ for (fl= 0; fl < 2; fl++) { for (wwin= curwin; wwin; wwin= wwin->prev) { if (((!fl && canReceiveFocus(wwin) > 0) || (fl && canReceiveFocus(wwin) < 0)) && - (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window)) { + (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window) && + (wwin->flags.mapped || include_unmapped)) { WMAddToArray(windows, wwin); } } @@ -410,7 +420,8 @@ for (wwin= curwin; wwin && wwin != curwin; wwin= wwin->prev) { if (((!fl && canReceiveFocus(wwin) > 0) || (fl && canReceiveFocus(wwin) < 0)) && - (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window)) { + (!WFLAGP(wwin, skip_window_list) || wwin->flags.internal_window) && + (wwin->flags.mapped || include_unmapped)) { WMAddToArray(windows, wwin); } } @@ -439,7 +450,8 @@ panel->scr= scr; - panel->windows= makeWindowListArray(scr, curwin, workspace); + panel->windows= makeWindowListArray(scr, curwin, workspace, + wPreferences.swtileImage!=0); count= WMGetArrayItemCount(panel->windows); if (count == 0) { @@ -458,6 +470,9 @@ panel->visibleCount= iconsThatFitCount; + if (!wPreferences.swtileImage) + return panel; + height= LABEL_HEIGHT + ICON_TILE_SIZE; panel->tileTmp= RCreateImage(ICON_TILE_SIZE, ICON_TILE_SIZE, 1); @@ -672,12 +687,15 @@ { WMFrame *icon; int i; + int focus= -1; if (!panel->win) return NULL; - if (event->type == MotionNotify) { - int focus= -1; + /* if (event->type == LeaveNotify) { + if (event->xcrossing.window == WMWidgetXID(panel->win)) + focus= 0; + } else*/ if (event->type == MotionNotify) { WM_ITERATE_ARRAY(panel->icons, icon, i) { if (WMWidgetXID(icon) == event->xmotion.window) { @@ -685,23 +703,19 @@ break; } } - - if (focus < 0) - focus= 0; - - if (focus >= 0 && panel->current != focus) { - WWindow *wwin; + } + if (focus >= 0 && panel->current != focus) { + WWindow *wwin; - changeImage(panel, panel->current, 0); - changeImage(panel, focus, 1); - panel->current= focus; + changeImage(panel, panel->current, 0); + changeImage(panel, focus, 1); + panel->current= focus; - wwin= WMGetFromArray(panel->windows, focus); + wwin= WMGetFromArray(panel->windows, focus); - drawTitle(panel, panel->current, wwin->frame->title); + drawTitle(panel, panel->current, wwin->frame->title); - return wwin; - } + return wwin; } return NULL; diff -Naur WindowMaker-0.91.0/src/wconfig.h wm/src/wconfig.h --- WindowMaker-0.91.0/src/wconfig.h 2004-10-26 08:13:01 +0400 +++ wm/src/wconfig.h 1970-01-01 03:00:00 +0300 @@ -1,572 +0,0 @@ -/* - * wconfig.h- default configuration and definitions + compile time options - * - * WindowMaker window manager - * - * Copyright (c) 1997-2003 Alfredo K. Kojima - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -#ifndef WMCONFIG_H_ -#define WMCONFIG_H_ - -#include "config.h" - -/*** Change this file (wconfig.h) *after* you ran configure ***/ - -/* - *-------------------------------------------------------------------- - * Feature Selection - * - * Comment out the following #defines if you want to - * disable a feature. - * Also check the features you can enable through configure. - *-------------------------------------------------------------------- - */ - - -/* - * #undefine if you dont want texture plugin support or your system have - * some sort of problem with them. - */ -#define TEXTURE_PLUGIN - -#ifdef TEXTURE_PLUGIN -#undef DRAWSTRING_PLUGIN -#endif - - -/* undefine ANIMATIONS if you don't want animations for iconification, - * shading, icon arrangement etc. */ -#define ANIMATIONS - - -/* - * undefine USECPP if you don't want your config files to be preprocessed - * by cpp - */ -#define USECPP - -/* #define CPP_PATH /usr/bin/cpp */ - - -#define NETWM_HINTS - -/* - * support for XDND drop in the Dock. Experimental - */ -/*#define XDND*/ - -/* - * support for Motif window manager (mwm) window hints - */ -#define MWM_HINTS - - -/* - * Undefine BALLOON_TEXT if you don't want balloons for showing extra - * information, like window titles that are not fully visible. - */ -#define BALLOON_TEXT - -/* - * If balloons should be shaped or be simple rectangles. - * The X server must support the shape extensions and it's support - * must be enabled (default). - */ -#define SHAPED_BALLOON - - -/* - * Turn on a hack to make mouse and keyboard actions work even if - * the NumLock or ScrollLock modifiers are turned on. They might - * inflict a performance/memory penalty. - * - * If you're an X expert (knows the implementation of XGrabKey() in X) - * and knows that the penalty is small (or not), please tell me. - */ -#define NUMLOCK_HACK - - - -/* - * define OPTIMIZE_SHAPE if you want the shape setting code to be optimized - * for applications that change their shape frequently (like xdaliclock - * -shape), removing flickering. If wmaker and your display are on - * different machines and the network connection is slow, it is not - * recommended. - */ -#undef OPTIMIZE_SHAPE - -/* define CONFIGURE_WINDOW_WHILE_MOVING if you want WindowMaker to send - * the synthetic ConfigureNotify event to windows while moving at every - * single movement. Default is to send a synthetic ConfigureNotify event - * only at the end of window moving, which improves performance. - */ -#undef CONFIGURE_WINDOW_WHILE_MOVING - - -/* - * disable/enable workspace indicator in the dock - */ -#undef WS_INDICATOR - - -/* - * define HIDDENDOT if you want a dot to be shown in the application icon - * of applications that are hidden. - */ -#define HIDDENDOT - - -/* - * Ignores the PPosition hint from clients. This is needed for some - * programs that have buggy implementations of such hint and place - * themselves in strange locations. - */ -#undef IGNORE_PPOSITION - - -/* - * Do not scale application icon and miniwindow icon images. - */ -#undef DONT_SCALE_ICONS - - - - - - -#define SILLYNESS - - - - - -/* - *.......................................................................... - * The following options WILL NOT BE MADE RUN-TIME. Please do not request. - * They will only add unneeded bloat. - *.......................................................................... - */ - -/* - * define SHADOW_RESIZEBAR if you want a resizebar with shadows like in - * AfterStep, instead of the default Openstep look. - * NEXTSTEP 3.3 also does not have these shadows. - */ -#undef SHADOW_RESIZEBAR - -/* - * Define DEMATERIALIZE_ICON if you want the undocked icon animation - * to be a progressive disaparison animation. - * This will cause all application icons to be created with Save Under - * enable. - */ -#undef DEMATERIALIZE_ICON - -/* - * Define ICON_KABOOM_EXTRA if you want extra fancy icon undocking - * explosion animation. - */ -#undef ICON_KABOOM_EXTRA - -/* - * #define if you want the window creation animation when superfluous - * is enabled. Only enable one of them. - */ -#undef WINDOW_BIRTH_ZOOM - -#undef WINDOW_BIRTH_ZOOM2 - -/* - * whether arrow drawing in clip buttons should be gradiented - */ -#undef GRADIENT_CLIP_ARROWS - - -/* - *-------------------------------------------------------------------- - * Default Configuration - * - * Some of the following options can be configured in - * the preference files, but if for some reason, they can't - * be used, these defaults will be. - * There are also some options that can only be configured here, - * at compile time. - *-------------------------------------------------------------------- - */ - -/* list of paths to look for the config files, searched in order - * of appearance */ -#define DEF_CONFIG_PATHS \ - "~/GNUstep/Library/WindowMaker:"PKGDATADIR - -#define DEF_MENU_FILE "menu" - -/* name of the script to execute at startup */ -#define DEF_INIT_SCRIPT "autostart" - -#define DEF_EXIT_SCRIPT "exitscript" - -#define DEFAULTS_DIR "Defaults" - -#ifdef USE_TIFF -#define DEF_BUTTON_IMAGES PKGDATADIR"/buttons.tiff" -#else -#define DEF_BUTTON_IMAGES PKGDATADIR"/buttons.xpm" -#endif - -/* the file of the system wide submenu to be forced into the main menu */ -#define GLOBAL_PREAMBLE_MENU_FILE "GlobalMenu.pre" -#define GLOBAL_EPILOGUE_MENU_FILE "GlobalMenu.post" - - -/* pixmap path */ -#define DEF_PIXMAP_PATHS \ - "(\"~/pixmaps\",\"~/GNUstep/Library/WindowMaker/Pixmaps\",\""PIXMAPDIR"\")" - -#ifdef USER_MENU -#define GLOBAL_USER_MENU_PATH PKGDATADIR"/UserMenus" -#define DEF_USER_MENU_PATHS \ - "~/GNUstep/Library/WindowMaker/UserMenus:"GLOBAL_USER_MENU_PATH -#endif - -/* icon path */ -#define DEF_ICON_PATHS \ - "(\"~/pixmaps\",\"~/GNUstep/Library/Icons\",\"/usr/include/X11/pixmaps/\",\""PIXMAPDIR"\")" - - -/* window title to use for untitled windows */ -#define DEF_WINDOW_TITLE "Untitled" - -/* default style */ -#define DEF_FRAME_COLOR "white" - - -#define DEF_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=12\"" -#define DEF_MENU_TITLE_FONT "\"Trebuchet MS,Luxi Sans:bold:pixelsize=12\"" -#define DEF_MENU_ENTRY_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=12\"" -#define DEF_ICON_TITLE_FONT "\"Arial,Luxi Sans:pixelsize=9\"" -#define DEF_CLIP_TITLE_FONT "\"Verdana:bold:pixelsize=10\"" -#define DEF_INFO_TEXT_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=12\"" - -#define DEF_WORKSPACE_NAME_FONT "\"Trebuchet MS,Luxi Sans:pixelsize=24\"" - - -#define DEF_FRAME_THICKNESS 1 /* linewidth of the move/resize frame */ - -#define DEF_WINDOW_TITLE_EXTEND_SPACE "0" -#define DEF_MENU_TITLE_EXTEND_SPACE "0" -#define DEF_MENU_TEXT_EXTEND_SPACE "0" -#define TITLEBAR_EXTEND_SPACE 4 - -#define DEF_XPM_CLOSENESS 40000 - -/* default position of application menus */ -#define DEF_APPMENU_X 10 -#define DEF_APPMENU_Y 10 - -/* calculate window edge resistance from edge resistance */ -#define WIN_RESISTANCE(x) (((x)*20)/30) - -/* Window level where icons reside */ -#define NORMAL_ICON_LEVEL WMNormalLevel - -/* do not divide main menu and submenu in different tiers, - * opposed to OpenStep */ -#define SINGLE_MENULEVEL - -/* max. time to spend doing animations in seconds. If the animation - * time exceeds this value, it is immediately finished. Usefull for - * moments of high-load. - */ -#define MAX_ANIMATION_TIME 1 - -/* Zoom animation */ -#define MINIATURIZE_ANIMATION_FRAMES_Z 5 -#define MINIATURIZE_ANIMATION_STEPS_Z 12 -#define MINIATURIZE_ANIMATION_DELAY_Z 10000 -/* Twist animation */ -#define MINIATURIZE_ANIMATION_FRAMES_T 12 -#define MINIATURIZE_ANIMATION_STEPS_T 16 -#define MINIATURIZE_ANIMATION_DELAY_T 20000 -#define MINIATURIZE_ANIMATION_TWIST_T 0.5 -/* Flip animation */ -#define MINIATURIZE_ANIMATION_FRAMES_F 12 -#define MINIATURIZE_ANIMATION_STEPS_F 16 -#define MINIATURIZE_ANIMATION_DELAY_F 20000 -#define MINIATURIZE_ANIMATION_TWIST_F 0.5 - - -#define HIDE_ANIMATION_STEPS (MINIATURIZE_ANIMATION_STEPS*2/3) - -/* delay before balloon is shown (ms) */ -#define BALLOON_DELAY 1000 - -/* delay for menu item selection hysteresis (ms) */ -#define MENU_SELECT_DELAY 200 - -/* delay for jumpback of scrolled menus (ms) */ -#define MENU_JUMP_BACK_DELAY 400 - -/* *** animation speed constants *** */ - -/* icon slide */ -#define ICON_SLIDE_SLOWDOWN_UF 1 -#define ICON_SLIDE_DELAY_UF 0 -#define ICON_SLIDE_STEPS_UF 50 - -#define ICON_SLIDE_SLOWDOWN_F 3 -#define ICON_SLIDE_DELAY_F 0 -#define ICON_SLIDE_STEPS_F 50 - -#define ICON_SLIDE_SLOWDOWN_M 5 -#define ICON_SLIDE_DELAY_M 0 -#define ICON_SLIDE_STEPS_M 30 - -#define ICON_SLIDE_SLOWDOWN_S 10 -#define ICON_SLIDE_DELAY_S 0 -#define ICON_SLIDE_STEPS_S 20 - -#define ICON_SLIDE_SLOWDOWN_US 20 -#define ICON_SLIDE_DELAY_US 1 -#define ICON_SLIDE_STEPS_US 10 - -/* menu scrolling */ -#define MENU_SCROLL_STEPS_UF 14 -#define MENU_SCROLL_DELAY_UF 1 - -#define MENU_SCROLL_STEPS_F 10 -#define MENU_SCROLL_DELAY_F 5 - -#define MENU_SCROLL_STEPS_M 6 -#define MENU_SCROLL_DELAY_M 5 - -#define MENU_SCROLL_STEPS_S 4 -#define MENU_SCROLL_DELAY_S 6 - -#define MENU_SCROLL_STEPS_US 1 -#define MENU_SCROLL_DELAY_US 8 - - -/* shade animation */ -#define SHADE_STEPS_UF 5 -#define SHADE_DELAY_UF 0 - -#define SHADE_STEPS_F 10 -#define SHADE_DELAY_F 0 - -#define SHADE_STEPS_M 15 -#define SHADE_DELAY_M 0 - -#define SHADE_STEPS_S 30 -#define SHADE_DELAY_S 0 - -#define SHADE_STEPS_US 40 -#define SHADE_DELAY_US 10 - - -/* workspace name on switch display */ -#define WORKSPACE_NAME_FADE_DELAY 30 - -#ifdef VIRTUAL_DESKTOP -/* workspace virtual edge speed */ -#define VIRTUALEDGE_SCROLL_VSTEP 30 -#define VIRTUALEDGE_SCROLL_HSTEP 30 -#endif - -#define WORKSPACE_NAME_DELAY 400 - -/* window birth animation steps (DO NOT MAKE IT RUN-TIME) */ -#define WINDOW_BIRTH_STEPS 20 - -/* number of steps for icon dematerialization. */ -#define DEMATERIALIZE_STEPS 16 - -/* Delay when cycling colors of selected icons. */ -#define COLOR_CYCLE_DELAY 200 - -/* size of the pieces in the undocked icon explosion */ -#define ICON_KABOOM_PIECE_SIZE 4 - - -/* Position increment for smart placement. >= 1 raise these values if it's - * too slow for you */ -#define PLACETEST_HSTEP 8 -#define PLACETEST_VSTEP 8 - - -#define DOCK_EXTRA_SPACE 0 - -/* Vicinity in which an icon can be attached to the clip */ -#define CLIP_ATTACH_VICINITY 1 - -#define CLIP_BUTTON_SIZE 23 - - -/* The amount of space (in multiples of the icon size) - * a docked icon must be dragged out to detach it */ -#define DOCK_DETTACH_THRESHOLD 3 - -/* Delay (in ms) after which the clip will autocollapse when leaved */ -#define AUTO_COLLAPSE_DELAY 1000 - -/* Delay (in ms) after which the clip will autoexpand when entered. - * Set this to zero if you want instant expanding. */ -#define AUTO_EXPAND_DELAY 600 - -/* Delay (in ms) after which the clip will be lowered when leaved */ -#define AUTO_LOWER_DELAY 1000 - -/* Delay (in ms) after which the clip will be raised when entered. - * Set this to zero if you want instant raise. */ -#define AUTO_RAISE_DELAY 600 - - -/* Max. number of icons the clip can have */ -#define CLIP_MAX_ICONS 32 - -/* blink interval when invoking a menu item */ -#define MENU_BLINK_DELAY 60000 -#define MENU_BLINK_COUNT 2 - -#define CURSOR_BLINK_RATE 300 - -#define MOVE_THRESHOLD 5 /* how many pixels to move before dragging windows - * and other objects */ - -#define KEY_CONTROL_WINDOW_WEIGHT 1 - -#define HRESIZE_THRESHOLD 3 - -#define MAX_WORKSPACENAME_WIDTH 32 -#define MAX_WINDOWLIST_WIDTH 160 /* max width of window title in - * window list */ - -#define DEFAULTS_CHECK_INTERVAL 2000 /* how often wmaker will check for - * changes in the config files */ - -/* if your keyboard don't have arrow keys */ -#undef ARROWLESS_KBD - - -/* don't put titles in miniwindows */ -#undef NO_MINIWINDOW_TITLES - - -#define FRAME_BORDER_COLOR "black" - - -/* for boxes with high mouse sampling rates (SGI) */ -#define DELAY_BETWEEN_MOUSE_SAMPLING 10 - - -/* - *---------------------------------------------------------------------- - * You should not modify the following values, unless you know - * what you're doing. - *---------------------------------------------------------------------- - */ - - -/* number of window shortcuts */ -#define MAX_WINDOW_SHORTCUTS 10 - - -#define WM_PI 3.14159265358979323846 - -#define FRAME_BORDER_WIDTH 1 /* width of window border for frames */ - -#define RESIZEBAR_HEIGHT 8 /* height of the resizebar */ -#define RESIZEBAR_MIN_WIDTH 20 /* min. width of handles-corner_width */ -#define RESIZEBAR_CORNER_WIDTH 28 /* width of the corner of resizebars */ - -#define MENU_INDICATOR_SPACE 12 - -/* minimum size for windows */ -#define MIN_WINDOW_SIZE 5 - -#define MIN_TITLEFONT_HEIGHT(h) ((h)>14 ? (h) : 14) - -#define ICON_WIDTH 64 /* size of the icon window */ -#define ICON_HEIGHT 64 -#define ICON_BORDER_WIDTH 2 - -#define MAX_ICON_WIDTH 60 /* size of the icon pixmap */ -#define MAX_ICON_HEIGHT 48 - -#define MAX_WORKSPACES 100 - -#define MAX_MENU_TEXT_LENGTH 512 - -#define MAX_RESTART_ARGS 16 - -#define MAX_COMMAND_SIZE 1024 - -#define MAX_DEAD_PROCESSES 128 - - -#define MAXLINE 1024 - - -#ifdef _MAX_PATH -# define DEFAULT_PATH_MAX _MAX_PATH -#else -# define DEFAULT_PATH_MAX 512 -#endif - - -#define DEBUG0 - -/* some rules */ - -#ifndef SHAPE -#undef SHAPED_BALLOON -#endif - -#ifdef XKB_MODELOCK -#define KEEP_XKB_LOCK_STATUS -/* This is a hidden feature. - * Choose just one of LANGUAGE_* hints. - * Icon can be changed in def_pixmaps.h. - * More icons are welcome. - */ -#define XKB_BUTTON_HINT -#undef LANGUAGE_TH -#undef LANGUAGE_SK -#endif - -#ifndef DEMATERIALIZE_ICON -# define NORMAL_ICON_KABOOM -#endif - -#if defined(HAVE_LIBINTL_H) && defined(I18N) -# include -# define _(text) gettext(text) -#else -# define _(text) (text) -#endif - - -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) -# define INLINE inline -#else -# define INLINE -#endif - -#endif /* WMCONFIG_H_ */ - diff -Naur WindowMaker-0.91.0/src/wconfig.h.in wm/src/wconfig.h.in --- WindowMaker-0.91.0/src/wconfig.h.in 2004-10-26 02:20:52 +0400 +++ wm/src/wconfig.h.in 2004-11-11 17:14:53 +0300 @@ -515,8 +515,6 @@ #define MAX_RESTART_ARGS 16 -#define MAX_COMMAND_SIZE 1024 - #define MAX_DEAD_PROCESSES 128 diff -Naur WindowMaker-0.91.0/src/window.c wm/src/window.c --- WindowMaker-0.91.0/src/window.c 2004-10-23 07:11:10 +0400 +++ wm/src/window.c 2005-03-23 02:15:11 +0300 @@ -2250,10 +2250,10 @@ sevent.xconfigure.height = wwin->client.height; sevent.xconfigure.border_width = wwin->old_border_width; - if (!HAS_TITLEBAR(wwin)) - sevent.xconfigure.above = None; - else + if (HAS_TITLEBAR(wwin) && wwin->frame->titlebar) sevent.xconfigure.above = wwin->frame->titlebar->window; + else + sevent.xconfigure.above = None; sevent.xconfigure.override_redirect = False; XSendEvent(dpy, wwin->client_win, False, StructureNotifyMask, &sevent); diff -Naur WindowMaker-0.91.0/src/winspector.c wm/src/winspector.c --- WindowMaker-0.91.0/src/winspector.c 2004-10-12 21:49:59 +0400 +++ wm/src/winspector.c 2005-03-05 02:47:09 +0300 @@ -1444,7 +1444,7 @@ caption = _("Do not bind mouse clicks"); flag = WFLAGP(wwin, no_bind_mouse); descr = _("Do not bind mouse actions, such as `Alt'+drag\n" - "in the window (when alt is the modifier you have" + "in the window (when alt is the modifier you have\n" "configured)."); break; case 2: diff -Naur WindowMaker-0.91.0/src/wmspec.c wm/src/wmspec.c --- WindowMaker-0.91.0/src/wmspec.c 2004-10-24 23:36:15 +0400 +++ wm/src/wmspec.c 2005-05-15 20:45:02 +0400 @@ -20,6 +20,14 @@ * USA. */ +/* + * TODO + * ---- + * + * This file needs to be checked for all calls to XGetWindowProperty() and + * proper checks need to be made on the returned values. Only checking for + * return to be Success is not enough. -Dan + */ #include "wconfig.h" @@ -295,7 +303,7 @@ atom[i++] = net_wm_icon_geometry; atom[i++] = net_wm_icon; atom[i++] = net_wm_handled_icons; - + atom[i++] = net_wm_name; atom[i++] = net_wm_icon_name; @@ -357,7 +365,7 @@ { int count; unsigned char *prop; - + prop= PropGetCheckProperty(scr->root_win, net_current_desktop, XA_CARDINAL, 0, 1, &count); if (prop) @@ -370,56 +378,109 @@ } +/* + * Find the best icon to be used by Window Maker for appicon/miniwindows. + * Currently the algorithm is to take the image with the size closest + * to icon_size x icon_size, but never bigger than that. + * + * This algorithm is very poorly implemented and needs to be redone (it can + * easily select images with very large widths and very small heights over + * square images, if the area of the former is closer to the desired one). + * + * The logic can also be changed to accept bigger images and scale them down. + */ +static CARD32* +findBestIcon(CARD32 *data, unsigned long items) +{ + int size, wanted, d, distance; + unsigned long i; + CARD32 *icon; + + /* better use only 75% of icon_size. For 64x64 this means 48x48 + * This leaves room around the icon for the miniwindow title and + * results in better overall aesthetics -Dan */ + wanted = wPreferences.icon_size * wPreferences.icon_size; + + for (icon=NULL, distance=LONG_MAX, i=0L; i=0 && d<=distance && (i+size+2)<=items) { + distance = d; + icon = &data[i]; + } + i += size+2; + } + + return icon; +} + + +static RImage* +makeRImageFromARGBData(CARD32 *data) +{ + int size, width, height, i; + RImage *image; + unsigned char *imgdata; + CARD32 pixel; + + width = data[0]; + height = data[1]; + size = width * height; + + if (size == 0) + return NULL; + + image = RCreateImage(width, height, True); + + for (imgdata=image->data, i=2; i> 24) & 0xff; /* A */ + imgdata[0] = (pixel >> 16) & 0xff; /* R */ + imgdata[1] = (pixel >> 8) & 0xff; /* G */ + imgdata[2] = (pixel >> 0) & 0xff; /* B */ + } + + return image; +} + + static void updateIconImage(WScreen *scr, WWindow *wwin) { - Atom actual_type_return; - int actual_format_return; - unsigned long nitems_return, bytes_after_return; - unsigned char *prop_return; - int rc = XGetWindowProperty(dpy, wwin->client_win, net_wm_icon, 0, ~0, False, - XA_CARDINAL, &actual_type_return, &actual_format_return, - &nitems_return, &bytes_after_return, &prop_return); - - if (rc==Success && prop_return) { - unsigned int *data = (unsigned int *)prop_return; - unsigned int pos = 0, len = 0; - unsigned int best_pos = 0, best_tmp = ~0; - extern WPreferences wPreferences; - unsigned int pref_size = wPreferences.icon_size; - unsigned int pref_sq = pref_size*pref_size; - char *src, *dst; - RImage *new_rimage; - - do { - len = data[pos+0]*data[pos+1]; - unsigned int tmp = pref_sq-len; - if (tmp < best_tmp && tmp > 0) { - best_tmp = tmp; - best_pos = pos; - } - pos += 2+len; - } while (pos < nitems_return && len != 0); + CARD32 *property, *data; + unsigned long items, rest; + Atom type; + int format; + RImage *image; + + if (XGetWindowProperty(dpy, wwin->client_win, net_wm_icon, 0L, LONG_MAX, + False, XA_CARDINAL, &type, &format, &items, &rest, + (unsigned char**)&property)!=Success || !property) { + return; + } - new_rimage = RCreateImage(data[best_pos+0], data[best_pos+1], True); - len = data[best_pos+0] * data[best_pos+1]; - src = (char*)&data[best_pos+2]; - dst = new_rimage->data; - for (pos=0; posnet_icon_image) - RReleaseImage(wwin->net_icon_image); - wwin->net_icon_image = new_rimage; - } + if (type!=XA_CARDINAL || format!=32 || items<2) { + XFree(property); + return; + } + + data = findBestIcon(property, items); + if (!data) { + XFree(property); + return; + } + + image = makeRImageFromARGBData(data); - XFree(prop_return); + if (image) { + if (wwin->net_icon_image) + RReleaseImage(wwin->net_icon_image); + wwin->net_icon_image = image; } + + XFree(property); } @@ -811,7 +872,7 @@ XDeleteProperty(dpy, wwin->client_win, net_wm_state); } } else { - Atom state[11]; /* nr of defined state atoms */ + Atom state[15]; /* nr of defined state atoms */ int i = 0; if(changedWorkspace || (wPreferences.sticky_icons && !IS_OMNIPRESENT(wwin))) @@ -834,7 +895,7 @@ state[i++] = net_wm_state_skip_pager; if (wwin->flags.miniaturized && wPreferences.sticky_icons) { - if( !IS_OMNIPRESENT(wwin)) + if (!IS_OMNIPRESENT(wwin)) updateWorkspaceHint(wwin, True, False); state[i++] = net_wm_state_sticky; } @@ -996,7 +1057,7 @@ set = !(wwin->flags.maximized & MAX_VERTICAL); } if (init) { - wwin->flags.maximized = set; + wwin->flags.maximized |= (set ? MAX_VERTICAL : 0); } else { if (set) { wMaximizeWindow(wwin, wwin->flags.maximized | MAX_VERTICAL); @@ -1009,7 +1070,7 @@ set = !(wwin->flags.maximized & MAX_HORIZONTAL); } if (init) { - wwin->flags.maximized = set; + wwin->flags.maximized |= (set ? MAX_HORIZONTAL : 0); } else { if (set) { wMaximizeWindow(wwin, wwin->flags.maximized | MAX_HORIZONTAL); @@ -1585,7 +1646,7 @@ char *name; char *ret; int size; - + name= (char*)PropGetCheckProperty(window, net_wm_icon_name, utf8_string, 0, 0, &size); diff -Naur WindowMaker-0.91.0/src/wsmap.c wm/src/wsmap.c --- WindowMaker-0.91.0/src/wsmap.c 1970-01-01 03:00:00 +0300 +++ wm/src/wsmap.c 2005-03-12 00:51:49 +0300 @@ -0,0 +1,96 @@ + +#include "WindowMaker.h" +#include "window.h" + + +typedef struct { + WWindow *wwin; + WMLabel *mini; +} WSMWindow; + + +typedef struct { + WScreen *scr; + + WMWindow *win; + + WSMWindow *windows; + int windowCount; + + int xcount, ycount; + int wswidth, wsheight; +} WWorkspaceMap; + + +#define WSMAP_DEFAULT_WIDTH 150 + + +static WWorkspaceMap *createWorkspaceMap(WMScreen *scr, int xcount, int ycount) +{ + WWorkspaceMap *wsm= wnew0(WWorkspaceMap, 1); + WMRect rect; + // + rect.width= 1024; + rect.height= 768; + + wsm->win= WMCreateWindow(scr, "wsmap"); + + /* find out the ideal size of the mini-workspaces */ + + wsm->wswidth = WSMAP_DEFAULT_WIDTH; + wsm->wsheight = (wsm->wswidth*rect.height) / rect.width; + + // check if it fits screen + + wsm->xcount = xcount; + wsm->ycount = ycount; + + + + return wsm; +} + + + +static void handleEvent(WWorkspaceMap *map, XEvent *event) +{ + switch (event->type) + { + } +} + + + +void wShowWorkspaceMap(WScreen *scr) +{ + +} + + + +Display *dpy; + +int main(int argc, char **argv) +{ + WWorkspaceMap *wsmap; + WMScreen *scr; + + WMInitializeApplication("WSMap", &argc, argv); + + dpy = XOpenDisplay(""); + if (!dpy) { + wfatal("cant open display"); + exit(0); + } + + scr = WMCreateSimpleApplicationScreen(dpy); + + wsmap= createWorkspaceMap(scr); + + WMRealizeWidget(wsmap->win); + WMMapWidget(wsmap->win); + + WMScreenMainLoop(scr); + + return 0; +} diff -Naur WindowMaker-0.91.0/test/CVS/Entries wm/test/CVS/Entries --- WindowMaker-0.91.0/test/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/test/CVS/Entries 2005-05-17 22:43:30 +0400 @@ -0,0 +1,5 @@ +/.cvsignore/1.5/Wed Apr 2 11:37:11 2003// +/Makefile.am/1.2/Wed Jan 6 15:22:49 1999// +/notest.c/1.2/Tue Oct 12 21:28:28 2004// +/wtest.c/1.5/Tue Oct 12 21:28:28 2004// +D diff -Naur WindowMaker-0.91.0/test/CVS/Repository wm/test/CVS/Repository --- WindowMaker-0.91.0/test/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/test/CVS/Repository 2005-05-17 22:43:30 +0400 @@ -0,0 +1 @@ +wm/test diff -Naur WindowMaker-0.91.0/test/CVS/Root wm/test/CVS/Root --- WindowMaker-0.91.0/test/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/test/CVS/Root 2005-05-17 22:43:30 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/test/.cvsignore wm/test/.cvsignore --- WindowMaker-0.91.0/test/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/test/.cvsignore 2003-04-02 15:37:11 +0400 @@ -0,0 +1,4 @@ +Makefile Makefile.in +wtest +.libs +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/test/Makefile.in wm/test/Makefile.in --- WindowMaker-0.91.0/test/Makefile.in 2004-10-26 08:10:45 +0400 +++ wm/test/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,346 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = notest.c - -noinst_PROGRAMS = wtest - -wtest_SOURCES = wtest.c - -wtest_LDADD = $(top_builddir)/wmlib/libWMaker.a @XLFLAGS@ @XLIBS@ - -INCLUDES = -g -D_BSD_SOURCE @XCFLAGS@ -I$(top_srcdir)/wmlib -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../src/config.h -CONFIG_CLEAN_FILES = -noinst_PROGRAMS = wtest$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I../src -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -wtest_OBJECTS = wtest.$(OBJEXT) -wtest_DEPENDENCIES = $(top_builddir)/wmlib/libWMaker.a -wtest_LDFLAGS = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = $(wtest_SOURCES) -OBJECTS = $(wtest_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps test/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-noinstPROGRAMS: - -clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) - -distclean-noinstPROGRAMS: - -maintainer-clean-noinstPROGRAMS: - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -wtest$(EXEEXT): $(wtest_OBJECTS) $(wtest_DEPENDENCIES) - @rm -f wtest$(EXEEXT) - $(LINK) $(wtest_LDFLAGS) $(wtest_OBJECTS) $(wtest_LDADD) $(LIBS) - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = test - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ - mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-noinstPROGRAMS distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ -clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/util/CVS/Entries wm/util/CVS/Entries --- WindowMaker-0.91.0/util/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/util/CVS/Entries 2005-05-17 22:43:30 +0400 @@ -0,0 +1,22 @@ +/.cvsignore/1.8/Sat Oct 23 00:25:52 2004// +/Makefile.am/1.33/Sat Oct 23 21:07:14 2004// +/README/1.11/Sat Oct 23 00:09:42 2004// +/bughint/1.2/Mon Jul 23 20:31:51 2001// +/convertfonts.c/1.8/Sat Oct 23 03:30:04 2004// +/directjpeg.c/1.5/Tue Oct 12 21:28:28 2004// +/fontconv.c/1.3/Fri Oct 22 22:27:11 2004// +/geticonset.c/1.8/Tue Oct 12 21:28:28 2004// +/getstyle.c/1.30/Sun Oct 17 06:27:53 2004// +/seticons.c/1.8/Tue Oct 12 21:28:28 2004// +/setstyle.c/1.32/Sun Oct 17 06:27:53 2004// +/wdread.c/1.7/Tue Oct 12 21:28:28 2004// +/wdwrite.c/1.6/Tue Oct 12 21:28:28 2004// +/wkdemenu.pl/1.5/Sat Feb 17 21:44:23 2001// +/wm-oldmenu2new/1.3/Wed Oct 27 02:54:32 2004// +/wmagnify.c/1.10/Tue Oct 12 21:28:28 2004// +/wmaker.inst.in/1.25/Fri Apr 8 11:51:06 2005// +/wmsetbg.c/1.55/Wed Oct 27 02:54:32 2004// +/wmsetup.c/1.10/Fri Mar 11 01:59:55 2005// +/wxcopy.c/1.9/Tue Oct 12 21:28:28 2004// +/wxpaste.c/1.8/Tue Oct 12 21:28:28 2004// +D diff -Naur WindowMaker-0.91.0/util/CVS/Repository wm/util/CVS/Repository --- WindowMaker-0.91.0/util/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/util/CVS/Repository 2005-05-17 22:43:30 +0400 @@ -0,0 +1 @@ +wm/util diff -Naur WindowMaker-0.91.0/util/CVS/Root wm/util/CVS/Root --- WindowMaker-0.91.0/util/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/util/CVS/Root 2005-05-17 22:43:30 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/util/.cvsignore wm/util/.cvsignore --- WindowMaker-0.91.0/util/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/util/.cvsignore 2004-10-23 04:25:52 +0400 @@ -0,0 +1,5 @@ +Makefile Makefile.in +wmsetup wmagnify wxcopy wxpaste wdwrite getstyle setstyle seticons geticonset +wmsetbg wmaker.inst wdread convertfonts +.libs +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/util/Makefile.in wm/util/Makefile.in --- WindowMaker-0.91.0/util/Makefile.in 2004-10-26 08:10:45 +0400 +++ wm/util/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,526 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -AUTOMAKE_OPTIONS = no-dependencies - -pkgdatadir = $(datadir)/@PACKAGE@ - -bin_PROGRAMS = wxcopy wxpaste wdwrite wdread getstyle setstyle convertfonts seticons geticonset wmsetbg wmsetup wmagnify - - -bin_SCRIPTS = wmaker.inst wm-oldmenu2new wkdemenu.pl - -EXTRA_DIST = wmaker.inst.in bughint wm-oldmenu2new directjpeg.c wkdemenu.pl - -INCLUDES = $(DFLAGS) -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib @HEADER_SEARCH_PATH@ -DETCDIR=\"sysconfdir\" -DDATADIR=\"pkgdatadir\" - - -liblist = @LIBRARY_SEARCH_PATH@ @INTLIBS@ - -wdwrite_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) - -wdread_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) - -wxcopy_LDADD = @XLFLAGS@ @XLIBS@ - -wxpaste_LDADD = @XLFLAGS@ @XLIBS@ - -getstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) - -getstyle_SOURCES = getstyle.c fontconv.c - -setstyle_LDADD = $(top_builddir)/WINGs/libWUtil.a @XLFLAGS@ @XLIBS@ $(liblist) - - -setstyle_SOURCES = setstyle.c fontconv.c - -convertfonts_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) - -convertfonts_SOURCES = convertfonts.c fontconv.c - -seticons_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) - -geticonset_LDADD = $(top_builddir)/WINGs/libWUtil.a $(liblist) - -wmagnify_LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la @XFTLIBS@ @INTLIBS@ @DLLIBS@ - - -wmsetup_LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la @XFTLIBS@ @INTLIBS@ @DLLIBS@ - - -wmsetbg_LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la @XLIBS@ @XFTLIBS@ @INTLIBS@ @DLLIBS@ - - -CLEANFILES = wmaker.inst -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../src/config.h -CONFIG_CLEAN_FILES = -bin_PROGRAMS = wxcopy$(EXEEXT) wxpaste$(EXEEXT) wdwrite$(EXEEXT) \ -wdread$(EXEEXT) getstyle$(EXEEXT) setstyle$(EXEEXT) \ -convertfonts$(EXEEXT) seticons$(EXEEXT) geticonset$(EXEEXT) \ -wmsetbg$(EXEEXT) wmsetup$(EXEEXT) wmagnify$(EXEEXT) -PROGRAMS = $(bin_PROGRAMS) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I../src -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -wxcopy_SOURCES = wxcopy.c -wxcopy_OBJECTS = wxcopy.$(OBJEXT) -wxcopy_DEPENDENCIES = -wxcopy_LDFLAGS = -wxpaste_SOURCES = wxpaste.c -wxpaste_OBJECTS = wxpaste.$(OBJEXT) -wxpaste_DEPENDENCIES = -wxpaste_LDFLAGS = -wdwrite_SOURCES = wdwrite.c -wdwrite_OBJECTS = wdwrite.$(OBJEXT) -wdwrite_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a -wdwrite_LDFLAGS = -wdread_SOURCES = wdread.c -wdread_OBJECTS = wdread.$(OBJEXT) -wdread_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a -wdread_LDFLAGS = -getstyle_OBJECTS = getstyle.$(OBJEXT) fontconv.$(OBJEXT) -getstyle_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a -getstyle_LDFLAGS = -setstyle_OBJECTS = setstyle.$(OBJEXT) fontconv.$(OBJEXT) -setstyle_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a -setstyle_LDFLAGS = -convertfonts_OBJECTS = convertfonts.$(OBJEXT) fontconv.$(OBJEXT) -convertfonts_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a -convertfonts_LDFLAGS = -seticons_SOURCES = seticons.c -seticons_OBJECTS = seticons.$(OBJEXT) -seticons_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a -seticons_LDFLAGS = -geticonset_SOURCES = geticonset.c -geticonset_OBJECTS = geticonset.$(OBJEXT) -geticonset_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a -geticonset_LDFLAGS = -wmsetbg_SOURCES = wmsetbg.c -wmsetbg_OBJECTS = wmsetbg.$(OBJEXT) -wmsetbg_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a \ -$(top_builddir)/wrlib/libwraster.la -wmsetbg_LDFLAGS = -wmsetup_SOURCES = wmsetup.c -wmsetup_OBJECTS = wmsetup.$(OBJEXT) -wmsetup_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a \ -$(top_builddir)/wrlib/libwraster.la -wmsetup_LDFLAGS = -wmagnify_SOURCES = wmagnify.c -wmagnify_OBJECTS = wmagnify.$(OBJEXT) -wmagnify_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a \ -$(top_builddir)/wrlib/libwraster.la -wmagnify_LDFLAGS = -SCRIPTS = $(bin_SCRIPTS) - -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = wxcopy.c wxpaste.c wdwrite.c wdread.c $(getstyle_SOURCES) $(setstyle_SOURCES) $(convertfonts_SOURCES) seticons.c geticonset.c wmsetbg.c wmsetup.c wmagnify.c -OBJECTS = wxcopy.$(OBJEXT) wxpaste.$(OBJEXT) wdwrite.$(OBJEXT) wdread.$(OBJEXT) $(getstyle_OBJECTS) $(setstyle_OBJECTS) $(convertfonts_OBJECTS) seticons.$(OBJEXT) geticonset.$(OBJEXT) wmsetbg.$(OBJEXT) wmsetup.$(OBJEXT) wmagnify.$(OBJEXT) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps util/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-binPROGRAMS: - -clean-binPROGRAMS: - -test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS) - -distclean-binPROGRAMS: - -maintainer-clean-binPROGRAMS: - -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(bin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -wxcopy$(EXEEXT): $(wxcopy_OBJECTS) $(wxcopy_DEPENDENCIES) - @rm -f wxcopy$(EXEEXT) - $(LINK) $(wxcopy_LDFLAGS) $(wxcopy_OBJECTS) $(wxcopy_LDADD) $(LIBS) - -wxpaste$(EXEEXT): $(wxpaste_OBJECTS) $(wxpaste_DEPENDENCIES) - @rm -f wxpaste$(EXEEXT) - $(LINK) $(wxpaste_LDFLAGS) $(wxpaste_OBJECTS) $(wxpaste_LDADD) $(LIBS) - -wdwrite$(EXEEXT): $(wdwrite_OBJECTS) $(wdwrite_DEPENDENCIES) - @rm -f wdwrite$(EXEEXT) - $(LINK) $(wdwrite_LDFLAGS) $(wdwrite_OBJECTS) $(wdwrite_LDADD) $(LIBS) - -wdread$(EXEEXT): $(wdread_OBJECTS) $(wdread_DEPENDENCIES) - @rm -f wdread$(EXEEXT) - $(LINK) $(wdread_LDFLAGS) $(wdread_OBJECTS) $(wdread_LDADD) $(LIBS) - -getstyle$(EXEEXT): $(getstyle_OBJECTS) $(getstyle_DEPENDENCIES) - @rm -f getstyle$(EXEEXT) - $(LINK) $(getstyle_LDFLAGS) $(getstyle_OBJECTS) $(getstyle_LDADD) $(LIBS) - -setstyle$(EXEEXT): $(setstyle_OBJECTS) $(setstyle_DEPENDENCIES) - @rm -f setstyle$(EXEEXT) - $(LINK) $(setstyle_LDFLAGS) $(setstyle_OBJECTS) $(setstyle_LDADD) $(LIBS) - -convertfonts$(EXEEXT): $(convertfonts_OBJECTS) $(convertfonts_DEPENDENCIES) - @rm -f convertfonts$(EXEEXT) - $(LINK) $(convertfonts_LDFLAGS) $(convertfonts_OBJECTS) $(convertfonts_LDADD) $(LIBS) - -seticons$(EXEEXT): $(seticons_OBJECTS) $(seticons_DEPENDENCIES) - @rm -f seticons$(EXEEXT) - $(LINK) $(seticons_LDFLAGS) $(seticons_OBJECTS) $(seticons_LDADD) $(LIBS) - -geticonset$(EXEEXT): $(geticonset_OBJECTS) $(geticonset_DEPENDENCIES) - @rm -f geticonset$(EXEEXT) - $(LINK) $(geticonset_LDFLAGS) $(geticonset_OBJECTS) $(geticonset_LDADD) $(LIBS) - -wmsetbg$(EXEEXT): $(wmsetbg_OBJECTS) $(wmsetbg_DEPENDENCIES) - @rm -f wmsetbg$(EXEEXT) - $(LINK) $(wmsetbg_LDFLAGS) $(wmsetbg_OBJECTS) $(wmsetbg_LDADD) $(LIBS) - -wmsetup$(EXEEXT): $(wmsetup_OBJECTS) $(wmsetup_DEPENDENCIES) - @rm -f wmsetup$(EXEEXT) - $(LINK) $(wmsetup_LDFLAGS) $(wmsetup_OBJECTS) $(wmsetup_LDADD) $(LIBS) - -wmagnify$(EXEEXT): $(wmagnify_OBJECTS) $(wmagnify_DEPENDENCIES) - @rm -f wmagnify$(EXEEXT) - $(LINK) $(wmagnify_LDFLAGS) $(wmagnify_OBJECTS) $(wmagnify_LDADD) $(LIBS) - -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - list='$(bin_SCRIPTS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = util - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: install-binPROGRAMS install-binSCRIPTS -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS -uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) $(SCRIPTS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(bindir) - - -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ - mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-binPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-binPROGRAMS distclean-compile distclean-libtool \ - distclean-tags distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-binPROGRAMS \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \ -maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \ -install-binSCRIPTS tags mostlyclean-tags distclean-tags clean-tags \ -maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean - - -wmaker.inst: $(srcdir)/wmaker.inst.in ./Makefile - -rm -f wmaker.inst - sed -e "s|#pkgdatadir#|$(pkgdatadir)|" \ - -e "s|#sysconfdir#|$(sysconfdir)/WindowMaker|" \ - -e "s|#version#|$(VERSION)|" \ - -e "s|#bindir#|$(bindir)|" \ - -e "s|#LITE#|@LITE@|" \ - $(srcdir)/wmaker.inst.in >wmaker.inst - - chmod 755 wmaker.inst - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/util/wmaker.inst.in wm/util/wmaker.inst.in --- WindowMaker-0.91.0/util/wmaker.inst.in 2004-10-17 02:16:21 +0400 +++ wm/util/wmaker.inst.in 2005-04-08 15:51:06 +0400 @@ -135,10 +135,6 @@ fi -if [ ! -d "$GSDIR/.AppInfo" ]; then - make_dir $GSDIR/.AppInfo -fi - if [ ! -d "$GSDIR/Defaults" ]; then make_dir $GSDIR/Defaults fi @@ -197,7 +193,6 @@ fi - if [ ! -d "$GSDIR/Library/WindowMaker/Backgrounds" ]; then echo "Creating bg image library $GSDIR/Library/WindowMaker/Backgrounds" make_dir $GSDIR/Library/WindowMaker/Backgrounds @@ -238,6 +233,14 @@ fi +if [ ! -d "$GSDIR/Library/WindowMaker/CachedPixmaps" ]; then + make_dir $GSDIR/Library/WindowMaker/CachedPixmaps +fi + +if [ ! -d "$GSDIR/Library/WindowMaker/WPrefs" ]; then + make_dir $GSDIR/Library/WindowMaker/WPrefs +fi + if test -z "#LITE#" ; then FILES=`(cd $GLOBALDIR; ls menu menu.* plmenu plmenu.?? wmmacros)` for i in $FILES; do diff -Naur WindowMaker-0.91.0/util/wm-oldmenu2new wm/util/wm-oldmenu2new --- WindowMaker-0.91.0/util/wm-oldmenu2new 1998-11-23 14:32:26 +0300 +++ wm/util/wm-oldmenu2new 2004-10-27 06:54:32 +0400 @@ -75,7 +75,9 @@ # Expand macros if necessary. # Create a temp copy of the menu file to edit to turn into the new. # -T=/tmp/wmmenu$$ +TD=$(/bin/mktemp -d /tmp/wmmenu.XXXXXX) || { echo "$0: can not create temporary file" >& 2; exit 1; } +T=$TD/wmmenu$$ + echo "Converting $GLW/$OLD_MENU --> $GD/$NEW_MENU" cd $WLW || exit 1 if [ ! -s "$OLD_MENU" ] @@ -198,7 +200,8 @@ } ' > $WD/$NEW_MENU.new || exit 1 -rm $T +rm -f $T +rm -fr $TD # # Now install it. diff -Naur WindowMaker-0.91.0/util/wmsetbg.c wm/util/wmsetbg.c --- WindowMaker-0.91.0/util/wmsetbg.c 2004-10-23 07:19:08 +0400 +++ wm/util/wmsetbg.c 2004-10-27 06:54:32 +0400 @@ -557,6 +557,7 @@ case 'C': { Pixmap tpixmap = XCreatePixmap( dpy, root, scrWidth, scrHeight, DefaultDepth(dpy, scr)); + XSetForeground(dpy, DefaultGC(dpy, scr), color.pixel); XFillRectangle(dpy, tpixmap, DefaultGC(dpy, scr), 0, 0, scrWidth, scrHeight); texture->pixmap = tpixmap; diff -Naur WindowMaker-0.91.0/util/wmsetup.c wm/util/wmsetup.c --- WindowMaker-0.91.0/util/wmsetup.c 2004-10-13 00:26:32 +0400 +++ wm/util/wmsetup.c 2005-03-11 04:59:55 +0300 @@ -41,17 +41,18 @@ char *RequiredDirectories[] = { "/Defaults", - "/.AppInfo", "/Library", "/Library/Icons", "/Library/WindowMaker", "/Library/WindowMaker/Backgrounds", "/Library/WindowMaker/IconSets", "/Library/WindowMaker/Pixmaps", + "/Library/WindowMaker/CachedPixmaps", "/Library/WindowMaker/SoundSets", "/Library/WindowMaker/Sounds", "/Library/WindowMaker/Styles", "/Library/WindowMaker/Themes", + "/Library/WindowMaker/WPrefs", NULL }; diff -Naur WindowMaker-0.91.0/WindowMaker/Backgrounds/CVS/Entries wm/WindowMaker/Backgrounds/CVS/Entries --- WindowMaker-0.91.0/WindowMaker/Backgrounds/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Backgrounds/CVS/Entries 2005-05-17 22:43:18 +0400 @@ -0,0 +1,4 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:08 2003// +/BlueImage.jpeg/1.1.1.1/Tue Sep 29 22:36:36 1998// +/Makefile.am/1.2/Wed Jan 6 15:22:39 1999// +D diff -Naur WindowMaker-0.91.0/WindowMaker/Backgrounds/CVS/Repository wm/WindowMaker/Backgrounds/CVS/Repository --- WindowMaker-0.91.0/WindowMaker/Backgrounds/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Backgrounds/CVS/Repository 2005-05-17 22:43:18 +0400 @@ -0,0 +1 @@ +wm/WindowMaker/Backgrounds diff -Naur WindowMaker-0.91.0/WindowMaker/Backgrounds/CVS/Root wm/WindowMaker/Backgrounds/CVS/Root --- WindowMaker-0.91.0/WindowMaker/Backgrounds/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Backgrounds/CVS/Root 2005-05-17 22:43:18 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WindowMaker/Backgrounds/.cvsignore wm/WindowMaker/Backgrounds/.cvsignore --- WindowMaker-0.91.0/WindowMaker/Backgrounds/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Backgrounds/.cvsignore 2003-04-02 15:37:08 +0400 @@ -0,0 +1,2 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WindowMaker/Backgrounds/Makefile.in wm/WindowMaker/Backgrounds/Makefile.in --- WindowMaker-0.91.0/WindowMaker/Backgrounds/Makefile.in 2004-10-26 08:10:46 +0400 +++ wm/WindowMaker/Backgrounds/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,243 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -defsdatadir = $(pkgdatadir)/Backgrounds - -defsdata_DATA = BlueImage.jpeg - -EXTRA_DIST = $(defsdata_DATA) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -DATA = $(defsdata_DATA) - -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Backgrounds/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-defsdataDATA: $(defsdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(defsdatadir) - @list='$(defsdata_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defsdatadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defsdatadir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(defsdatadir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(defsdatadir)/$$p; \ - fi; fi; \ - done - -uninstall-defsdataDATA: - @$(NORMAL_UNINSTALL) - list='$(defsdata_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(defsdatadir)/$$p; \ - done -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WindowMaker/Backgrounds - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-defsdataDATA -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-defsdataDATA -uninstall: uninstall-am -all-am: Makefile $(DATA) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(defsdatadir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: uninstall-defsdataDATA install-defsdataDATA tags distdir info-am \ -info dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WindowMaker/CVS/Entries wm/WindowMaker/CVS/Entries --- WindowMaker-0.91.0/WindowMaker/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/CVS/Entries 2005-05-17 22:43:18 +0400 @@ -0,0 +1,55 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:07 2003// +/Makefile.am/1.26/Sun Oct 17 04:32:25 2004// +/README/1.20/Mon May 14 15:18:32 2001// +/README.themes/1.2/Thu Mar 18 01:11:19 1999// +/autostart.sh/1.2/Sat May 15 17:38:06 1999// +/exitscript.sh/1.2/Sat May 15 17:38:06 1999// +/menu/1.20/Sat Oct 23 03:53:25 2004// +/menu.bg/1.3/Sat Oct 23 03:53:25 2004// +/menu.ca/1.6/Sun Oct 17 04:32:25 2004// +/menu.cz/1.5/Sun Oct 17 04:32:25 2004// +/menu.da/1.7/Sun Oct 17 04:32:25 2004// +/menu.de/1.5/Sun Oct 17 04:32:25 2004// +/menu.el/1.9/Sun Oct 17 04:32:25 2004// +/menu.es/1.7/Sun Oct 17 04:32:25 2004// +/menu.fi/1.9/Sat Oct 23 03:53:25 2004// +/menu.fr/1.9/Sun Oct 17 04:32:25 2004// +/menu.gl/1.4/Sun Oct 17 04:32:25 2004// +/menu.he/1.7/Sun Oct 17 04:32:25 2004// +/menu.hr/1.7/Sun Oct 17 04:32:25 2004// +/menu.hu/1.9/Sun Oct 17 04:32:25 2004// +/menu.it/1.4/Sat May 29 21:41:26 1999// +/menu.ja/1.7/Sun Oct 17 04:32:25 2004// +/menu.ko/1.10/Sat Oct 23 03:53:25 2004// +/menu.nl/1.3/Sat May 1 23:15:44 1999// +/menu.no/1.6/Sun Oct 17 04:32:25 2004// +/menu.pl/1.4/Sun Oct 17 04:32:25 2004// +/menu.pt/1.7/Sun Oct 17 04:32:25 2004// +/menu.ro/1.3/Sat Oct 23 03:53:25 2004// +/menu.ru/1.4/Sun Oct 17 04:32:25 2004// +/menu.se/1.7/Sun Oct 17 04:32:25 2004// +/menu.sk/1.4/Sat Oct 23 03:53:25 2004// +/menu.sl/1.7/Sun Oct 17 04:32:25 2004// +/menu.tr/1.7/Sun Oct 17 04:32:25 2004// +/menu.zh_CN/1.6/Sun Oct 17 04:32:25 2004// +/menu.zh_TW/1.2/Sat Oct 23 03:53:25 2004// +/mkMakefile/1.2/Mon Jan 11 12:28:14 1999// +/plmenu/1.20/Sat Oct 23 03:53:25 2004// +/plmenu.bg/1.3/Sat Oct 23 03:53:25 2004// +/plmenu.da/1.7/Sun Oct 17 04:32:25 2004// +/plmenu.de/1.3/Sun Oct 17 04:32:25 2004// +/plmenu.es/1.2/Sat Oct 23 03:53:25 2004// +/plmenu.fi/1.3/Sat Oct 23 03:53:25 2004// +/plmenu.fr/1.6/Sun Oct 17 04:32:25 2004// +/plmenu.hr/1.6/Tue Jan 4 21:45:57 2000// +/plmenu.it/1.6/Sun Oct 17 04:32:25 2004// +/plmenu.ja/1.4/Sat Oct 23 03:53:25 2004// +/plmenu.ko/1.4/Sat Oct 23 03:53:25 2004// +/plmenu.pl/1.3/Sun Oct 17 04:32:25 2004// +/plmenu.ro/1.3/Sat Oct 23 03:53:25 2004// +/plmenu.sk/1.3/Sat Oct 23 03:53:25 2004// +/plmenu.zh_CN/1.7/Sun Oct 17 04:32:26 2004// +/plmenu.zh_TW/1.2/Sat Oct 23 03:53:25 2004// +/wmmacros/1.4/Mon Jan 11 12:39:36 1999// +/xtree.dat/1.2/Mon Dec 25 01:25:02 2000// +D diff -Naur WindowMaker-0.91.0/WindowMaker/CVS/Entries.Log wm/WindowMaker/CVS/Entries.Log --- WindowMaker-0.91.0/WindowMaker/CVS/Entries.Log 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/CVS/Entries.Log 2005-05-17 22:43:25 +0400 @@ -0,0 +1,8 @@ +A D/Backgrounds//// +A D/Defaults//// +A D/IconSets//// +A D/Icons//// +A D/Pixmaps//// +A D/Sounds//// +A D/Styles//// +A D/Themes//// diff -Naur WindowMaker-0.91.0/WindowMaker/CVS/Repository wm/WindowMaker/CVS/Repository --- WindowMaker-0.91.0/WindowMaker/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/CVS/Repository 2005-05-17 22:43:17 +0400 @@ -0,0 +1 @@ +wm/WindowMaker diff -Naur WindowMaker-0.91.0/WindowMaker/CVS/Root wm/WindowMaker/CVS/Root --- WindowMaker-0.91.0/WindowMaker/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/CVS/Root 2005-05-17 22:43:17 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WindowMaker/.cvsignore wm/WindowMaker/.cvsignore --- WindowMaker-0.91.0/WindowMaker/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/.cvsignore 2003-04-02 15:37:07 +0400 @@ -0,0 +1,2 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WindowMaker/Defaults/CVS/Entries wm/WindowMaker/Defaults/CVS/Entries --- WindowMaker-0.91.0/WindowMaker/Defaults/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Defaults/CVS/Entries 2005-05-17 22:43:18 +0400 @@ -0,0 +1,7 @@ +/.cvsignore/1.5/Wed Apr 2 11:37:08 2003// +/Makefile.am/1.8/Fri Apr 8 11:51:06 2005// +/WMGLOBAL/1.15/Tue Oct 26 01:11:15 2004// +/WMState.in/1.5/Wed Oct 20 03:25:07 1999// +/WMWindowAttributes.in/1.23/Tue Mar 22 23:15:11 2005// +/WindowMaker.in/1.31/Wed Oct 27 02:54:32 2004// +D diff -Naur WindowMaker-0.91.0/WindowMaker/Defaults/CVS/Repository wm/WindowMaker/Defaults/CVS/Repository --- WindowMaker-0.91.0/WindowMaker/Defaults/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Defaults/CVS/Repository 2005-05-17 22:43:18 +0400 @@ -0,0 +1 @@ +wm/WindowMaker/Defaults diff -Naur WindowMaker-0.91.0/WindowMaker/Defaults/CVS/Root wm/WindowMaker/Defaults/CVS/Root --- WindowMaker-0.91.0/WindowMaker/Defaults/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Defaults/CVS/Root 2005-05-17 22:43:18 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WindowMaker/Defaults/.cvsignore wm/WindowMaker/Defaults/.cvsignore --- WindowMaker-0.91.0/WindowMaker/Defaults/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Defaults/.cvsignore 2003-04-02 15:37:08 +0400 @@ -0,0 +1,3 @@ +Makefile Makefile.in +WMState WMWindowAttributes WindowMaker WMRootMenu +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WindowMaker/Defaults/Makefile.am wm/WindowMaker/Defaults/Makefile.am --- WindowMaker-0.91.0/WindowMaker/Defaults/Makefile.am 2001-03-12 04:56:26 +0300 +++ wm/WindowMaker/Defaults/Makefile.am 2005-04-08 15:51:06 +0400 @@ -3,6 +3,8 @@ defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL +wpexecbindir = @wprefs_bindir@ + EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WindowMaker.in WMState.in CLEANFILES = WMWindowAttributes WindowMaker WMState @@ -21,7 +23,7 @@ WMState: $(srcdir)/WMState.in -rm -f WMState - sed -e "s:#wprefs#:$(wprefsdir)/WPrefs:" $(srcdir)/WMState.in > WMState + sed -e "s:#wprefs#:$(wpexecbindir)/WPrefs:" $(srcdir)/WMState.in > WMState chmod 644 WMState WMRootMenu: $(srcdir)/../plmenu diff -Naur WindowMaker-0.91.0/WindowMaker/Defaults/Makefile.in wm/WindowMaker/Defaults/Makefile.in --- WindowMaker-0.91.0/WindowMaker/Defaults/Makefile.in 2004-10-26 08:10:46 +0400 +++ wm/WindowMaker/Defaults/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,266 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -defsdatadir = $(sysconfdir)/WindowMaker - -defsdata_DATA = WMRootMenu WMWindowAttributes WindowMaker WMState WMGLOBAL - -EXTRA_DIST = WMGLOBAL WMWindowAttributes.in WindowMaker.in WMState.in - -CLEANFILES = WMWindowAttributes WindowMaker WMState -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -DATA = $(defsdata_DATA) - -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Defaults/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-defsdataDATA: $(defsdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(defsdatadir) - @list='$(defsdata_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defsdatadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defsdatadir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(defsdatadir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(defsdatadir)/$$p; \ - fi; fi; \ - done - -uninstall-defsdataDATA: - @$(NORMAL_UNINSTALL) - list='$(defsdata_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(defsdatadir)/$$p; \ - done -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WindowMaker/Defaults - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-defsdataDATA -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-defsdataDATA -uninstall: uninstall-am -all-am: Makefile $(DATA) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(defsdatadir) - - -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: uninstall-defsdataDATA install-defsdataDATA tags distdir info-am \ -info dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -WMWindowAttributes: $(srcdir)/WMWindowAttributes.in - -rm -f WMWindowAttributes - sed -e "s:#extension#:@ICONEXT@:" \ - $(srcdir)/WMWindowAttributes.in > WMWindowAttributes - chmod 644 WMWindowAttributes - -WindowMaker: $(srcdir)/WindowMaker.in - -rm -f WindowMaker - sed -e "s:#pkgdatadir#:$(pkgdatadir):" $(srcdir)/WindowMaker.in \ - > WindowMaker - chmod 644 WindowMaker - -WMState: $(srcdir)/WMState.in - -rm -f WMState - sed -e "s:#wprefs#:$(wprefsdir)/WPrefs:" $(srcdir)/WMState.in > WMState - chmod 644 WMState - -WMRootMenu: $(srcdir)/../plmenu - -cp -f $(srcdir)/../plmenu WMRootMenu - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WindowMaker/Defaults/WindowMaker.in wm/WindowMaker/Defaults/WindowMaker.in --- WindowMaker-0.91.0/WindowMaker/Defaults/WindowMaker.in 2004-10-25 05:54:08 +0400 +++ wm/WindowMaker/Defaults/WindowMaker.in 2004-10-27 06:54:32 +0400 @@ -1,6 +1,5 @@ { SmoothWorkspaceBack = NO; - WindozeCycling = YES; PopupSwitchMenu = NO; MenuStyle = normal; DisableMiniwindows = NO; diff -Naur WindowMaker-0.91.0/WindowMaker/Defaults/WMWindowAttributes.in wm/WindowMaker/Defaults/WMWindowAttributes.in --- WindowMaker-0.91.0/WindowMaker/Defaults/WMWindowAttributes.in 2004-10-08 00:44:28 +0400 +++ wm/WindowMaker/Defaults/WMWindowAttributes.in 2005-03-23 02:15:11 +0300 @@ -74,6 +74,7 @@ SkipWindowList = Yes; DontSaveSession = Yes; Unfocusable = Yes; + NoAppIcon = Yes; }; kio_uiserver = {NoAppIcon = Yes;}; kcmshell = {NoAppIcon = Yes;}; diff -Naur WindowMaker-0.91.0/WindowMaker/Icons/CVS/Entries wm/WindowMaker/Icons/CVS/Entries --- WindowMaker-0.91.0/WindowMaker/Icons/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Icons/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1,74 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:08 2003// +/BitchX.tiff/1.1/Mon Jan 25 19:06:56 1999// +/BitchX.xpm/1.1/Mon Jan 25 19:06:56 1999// +/DefaultAppIcon.tiff/1.1/Mon Jan 25 19:06:56 1999// +/Ear.png/1.2/Sat Jan 26 15:52:22 2002/-kb/ +/Ftp.png/1.1/Sat Dec 30 10:06:36 2000// +/GNUstep.tiff/1.1.1.1/Tue Sep 29 22:36:36 1998// +/GNUstep.xpm/1.1.1.1/Tue Sep 29 22:36:36 1998// +/GNUstep3D.tiff/1.1.1.1/Tue Sep 29 22:36:36 1998// +/GNUstep3D.xpm/1.1.1.1/Tue Sep 29 22:36:36 1998// +/GNUstepGlow.tiff/1.1/Mon Jan 25 19:06:57 1999// +/GNUstepGlow.xpm/1.1/Mon Jan 25 19:06:57 1999// +/GNUterm.tiff/1.2/Mon Jan 25 19:06:57 1999// +/GNUterm.xpm/1.2/Mon Jan 25 19:06:57 1999// +/GreenWilber.png/1.1/Sat Dec 30 10:06:36 2000// +/ICQ.png/1.2/Sat Dec 29 21:31:29 2001// +/Jabber.png/1.4/Mon Dec 31 12:39:17 2001/-kb/ +/Magnify.tiff/1.1/Wed Mar 15 01:25:57 2000// +/Magnify.xpm/1.1/Wed Mar 15 01:25:57 2000// +/Makefile.am/1.7/Sun Dec 30 01:58:30 2001// +/Mouth.png/1.2/Sat Jan 26 15:56:26 2002/-kb/ +/Mozilla.png/1.1/Sat Dec 30 10:06:36 2000// +/Netscape.png/1.1/Sat Dec 30 10:06:36 2000// +/Pen.png/1.1/Sat Dec 30 10:06:36 2000// +/Pencil.png/1.1/Sat Dec 30 10:06:36 2000// +/README/1.4/Tue Mar 14 00:54:34 2000// +/Real.png/1.1/Sat Dec 30 10:06:36 2000// +/Shell.png/1.1/Sat Dec 30 10:06:36 2000// +/Speaker.png/1.1/Sat Dec 30 10:06:36 2000// +/Terminal.tiff/1.2/Mon Mar 27 04:53:39 2000// +/Terminal.xpm/1.2/Mon Mar 27 04:53:39 2000// +/TerminalGNUstep.tiff/1.1/Tue Mar 14 00:50:42 2000// +/TerminalGNUstep.xpm/1.1/Tue Mar 14 00:50:43 2000// +/TerminalLinux.tiff/1.1/Tue Mar 14 00:50:43 2000// +/TerminalLinux.xpm/1.1/Tue Mar 14 00:50:43 2000// +/Wine.png/1.2/Sun Jan 27 05:59:29 2002/-kb/ +/XChat.png/1.1/Sat Dec 30 10:06:36 2000// +/clip.tiff/1.1.1.1/Tue Sep 29 22:36:36 1998// +/clip.xpm/1.1.1.1/Tue Sep 29 22:36:36 1998// +/defaultAppIcon.tiff/1.1.1.1/Tue Sep 29 22:36:36 1998// +/defaultAppIcon.xpm/1.1.1.1/Tue Sep 29 22:36:36 1998// +/defaultterm.tiff/1.1/Mon Jan 25 19:06:57 1999// +/defaultterm.xpm/1.1/Mon Jan 25 19:06:57 1999// +/draw.tiff/1.1/Mon Jan 25 19:06:57 1999// +/draw.xpm/1.1/Mon Jan 25 19:06:57 1999// +/linuxterm.tiff/1.1/Mon Jan 25 19:06:57 1999// +/linuxterm.xpm/1.1/Mon Jan 25 19:06:57 1999// +/mixer.tiff/1.1/Mon Jan 25 19:06:57 1999// +/mixer.xpm/1.1/Mon Jan 25 19:06:57 1999// +/notepad.tiff/1.1/Mon Jan 25 19:06:57 1999// +/notepad.xpm/1.1/Mon Jan 25 19:06:57 1999// +/pdf.tiff/1.1/Mon Jan 25 19:06:57 1999// +/pdf.xpm/1.1/Mon Jan 25 19:06:57 1999// +/ps.tiff/1.1/Mon Jan 25 19:06:57 1999// +/ps.xpm/1.1/Mon Jan 25 19:06:57 1999// +/real.tiff/1.1/Mon Jan 25 19:06:57 1999// +/real.xpm/1.1/Mon Jan 25 19:06:57 1999// +/sgiterm.tiff/1.1/Mon Jan 25 19:06:57 1999// +/sgiterm.xpm/1.1/Mon Jan 25 19:06:57 1999// +/sound.tiff/1.1/Mon Jan 25 19:06:57 1999// +/sound.xpm/1.1/Mon Jan 25 19:06:57 1999// +/staroffice2.tiff/1.1/Mon Jan 25 19:06:57 1999// +/staroffice2.xpm/1.1/Mon Jan 25 19:06:57 1999// +/timer.tiff/1.1/Mon Jan 25 19:06:57 1999// +/timer.xpm/1.1/Mon Jan 25 19:06:57 1999// +/wilber.tiff/1.1/Mon Jan 25 19:06:57 1999// +/wilber.xpm/1.1/Mon Jan 25 19:06:57 1999// +/write.tiff/1.1/Mon Jan 25 19:06:57 1999// +/write.xpm/1.1/Mon Jan 25 19:06:57 1999// +/xdvi.tiff/1.1/Mon Jan 25 19:06:57 1999// +/xdvi.xpm/1.1/Mon Jan 25 19:06:57 1999// +/xv.tiff/1.1/Mon Jan 25 19:06:57 1999// +/xv.xpm/1.1/Mon Jan 25 19:06:57 1999// +D diff -Naur WindowMaker-0.91.0/WindowMaker/Icons/CVS/Repository wm/WindowMaker/Icons/CVS/Repository --- WindowMaker-0.91.0/WindowMaker/Icons/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Icons/CVS/Repository 2005-05-17 22:43:18 +0400 @@ -0,0 +1 @@ +wm/WindowMaker/Icons diff -Naur WindowMaker-0.91.0/WindowMaker/Icons/CVS/Root wm/WindowMaker/Icons/CVS/Root --- WindowMaker-0.91.0/WindowMaker/Icons/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Icons/CVS/Root 2005-05-17 22:43:18 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WindowMaker/Icons/.cvsignore wm/WindowMaker/Icons/.cvsignore --- WindowMaker-0.91.0/WindowMaker/Icons/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Icons/.cvsignore 2003-04-02 15:37:08 +0400 @@ -0,0 +1,2 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WindowMaker/Icons/Ear.png wm/WindowMaker/Icons/Ear.png --- WindowMaker-0.91.0/WindowMaker/Icons/Ear.png 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Icons/Ear.png 2002-01-26 18:52:22 +0300 @@ -0,0 +1,35 @@ +PNG + + IHDR@@iqbKGD pHYs  tIME{ IDATxIeɕ;wdR]Z$@ i} }!+ 6zӍ]%RC$$1{ G FgfOW>ŏ|˥,lTd|7I\]su&x֋x/.9(mp?xS`f!^v#@3Ͽq ͆1F ̟̩R8Y.3h?OmƼ9p.N׃ovr@d']X-b~zq*9/rNaxM$Ml[D4%0FfxPv#Sʬ\ +9Tq wJpiH)r"xX.6R,f8xv޻mNy'8O&S<%b.QqK;G9}5goaQ"`F"UZqf:euS}i9MqeuAֹ4A2N1SN&xڶd~ ''VkB|a9GJs!㜣[]t,V G΁=G?pcΜjY]|~(vwJ)\n69 w_8ږڶR:ڵm˅r0V}^j:}bOyՊn`:auzB8u" rIYF^ꌄxBQMm,8;-V,W+<:Olo.8]un7˯-Z 3O.޷MN5NdM4y!8uaaG7(*"}ON8[/=}ŇϞr^>9eyrJ\.`rxO!2L) 9D񊄈 &4!8 \2{\r)ffzo8QQ?IwL ;07DDNV}wb&}p^~+>~O:9?9Ix0&RLb@E +!bǑb*GPٺ¢ᤡuZ=e_3}#)gSR'9qNuI흄Qr`&mH˔,VN Y=90|zOS~Fl6{ipI1TqBΙ4QR?CM8Z֋ӲѩL,-Xo_0DpNr)J*1s)'*/;UirˮeKPOG|"{B^;"3!A^hL H3?+V0rwPWھ9OΕܔ1Ad4! ++Q&T2[G#MͭBϞO_}iB`XеAlOu^kQ'ȤEϢk1u\8Yz>~'g'"X6rNBh"qӄ''7 mۢSJaJLc$'@ CQJF0rՂ *8J! E?Sn7;~[b*rXo)onȥvG'B6@+F8].wPuXY +yJd)V]l TP+ЕLaF:*I'"$(E!J*8r7-x_ Sd?LURɲ-3] )}߱^.xrv}ע:(JaL(HPJ׀t',[:Q9b7=$9ndbqLVzܨ+:a6Blx_*27T~kI)׆\mNj'8?]5 fKi=T"Jq"Z.f" t]f܃,I)SĘ̐E⋧mL#X0'#CzO d8Y4!4Sl 6t  Hh]@u-UI\s7ꏯڙbeѵx8RRh64s"w-!J)\(s|=m0b'gGrS(GCW+ڶAQ]uuN:/XPXHFZ/ +Cݷ,f7=zzOC\nfCu=MPLR*F|{~;b?з E%Ư|7L)&0[qmddF"xOuì!he|(#BFZg N#~~~{~eGq`۰ + x|r pwt}O-"wD ;HX-=4 wiTئ~ݲQQ66l9 >*/sv+:LA=yL5Z}j,:d/tCyss{<%fLz)9]]3nM9flj˻Ww;9O0 #%k^⃣{O6 J~.{ }3-f0_BFJ£ƑcP:hT1CB|o.{ƒ9!ڒ\$L^4 +*H% wLb )qw1Ȕ?RÇZHuXcljR;gW:v̪^W%*$1:Wv V2^B8fw$S44#8GőiJSf˻-qb|9NhBg/BX[, e^fx\OޫJbbH2S$eUIߢRTj8^~ȳ5f 8XL>Z֩ԮjXLF9 )4L̩p ńbMS7A@=CT֐% ((PdVx͞r*/|}G` KMfāT2I21e6=5wq~'T%myv~j૷be甘 RY<D4ۄIOŤZ!,y7D˯oz?czMtCkis_o;v{S"rKDX9QfnWUf/2ω76yE3X,P7gPAq0rĻg ǻ[aCq.=]aMBy}?+r7]qVW^Af+aʥ'.4(U˧؜sHjm NW_Z^ S6hbMK B(j`LwtmEh- +R*l{\LÀѮi'I+[U|oC@8'ެlRPRB)8_}8jU~ICy|shhP?NX+c7l_| 1F?>'BL tm`65[ S c9ȱpi8~_r{]^yzVno ok+VGܬ':V'K^d s M.FhZpM T>+vcqL Zg¢)<8S."Bʙͦz MWR3ǜIA:/S,%sj^dd'V} !' ^YъX2RcoquwWOJ1Y6J2NB6R(1lӿ\gDIjD =g/oi)Bh)S-:RU㽣mMiPTv<2y#}ysǛ+ +Sݿ2Sܜ*ޑf0tFHq"WYd yȑf0B$I 4Np&:тDN i9cyB,d|Q}o:t ds$iqbJGnn7\m6dbBVhսVUR qjS#C4N:V6љmGl k{sy͛.NW &H=dNֶΉ|U/38_rJxghXmy,tH-9sL[ʰpnfO6j\ mrLNk| [ყg^_qɹ8mb4ęAeTPE +ʷS$[!tRA0vxB[Q0;Qc.3h=ofkNɥX2ZL^Տ_./xyueXXRwRTɡ( $<3ՀG,g@ u- +7#mYvR3v8CD|eܒ6;vnbXm;]6 ޼S;;Yewx;O^GgMy!Wn۱96 xZqͤMfR+,[B=w7wv'n^,a{<fҘNDzU ʤ"UEDT@X#K8J) 쇁al-nbzʅTT +c8ip@!j\25to(v/{_7TF>|9]vw?9 9(Y3P3DE,X,*n,bILp҇b)DI 5&&;3?* m]f/milʹߤoRIwEoNDI"rbA(9; (3p6C5p]*PJb\ʈ50 fZJYNji;a:k(KES)u3 &%SqwO[|)Έpo+*˹f{NϹ0eT M2Ϭ &ɔ!zաKIXɈ>HJWdzQ1*aif k $Dƛ7aw\lO4Ńw4JE!0\ʹ>bHطW1C/Z=@N]@yR,u1:8E7􈹀U7f@r´\߄no!x?Y(IENDB` \ diff -Naur WindowMaker-0.91.0/WindowMaker/Icons/Magnify.tiff wm/WindowMaker/Icons/Magnify.tiff --- WindowMaker-0.91.0/WindowMaker/Icons/Magnify.tiff 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Icons/Magnify.tiff 2000-03-15 04:25:57 +0300 @@ -0,0 +1,31 @@ +II*~ P8$ BaPd6DbQ8V-FcQv=HdR9$M'JeRd]/LfS9m7NgS} AhN +D aFA@zN~|\.W}~6 oZ $0S"L@ o?@(,=>@7~=ly*LǪ~۸X J(z )`c;A([BИ + 9u WQ=`g~IBWEJ)@h4 Rxf{@2` Š#>;ȱП*ynG(ˆ.~ <}\wEوz A40"{ }rZ@ `` +G=1<3ϟ~zgxx{@tIG|F&1D`RAԛS@!7'aJFX` <P\j14523,M L@CDzU[BzDZeCJj86NvXwZb8@,/ w.h +N(H E$EX J SyT{.}H~`q}5{LfNe @Bd*u iryP0N X}G`a!_u --ͷ$w6LO j##D݁4&d +@d`^ Ka0:{#P*Ĩ sq"58ܢGOE0<$SWH2Lu=@ \`/ 8~@hG.x"=`e?hec&?*#'V( +q,53ȋWh?y"cKrE5&̹<``\ =q샠J}"GG@x5}Q9R"0"@.p>4kc@ >(I5+#2ʳ/* ]n)LMuf`P8@A `X |8FĀ +kq \ Q@ef@IO2zX9jgAI +gqGE?P sUc Ӱ N.#4Bm%`sXM >Gsu'FH.}@?QuX@9fWU'̯s!/cs\ "U;.y=x n,8Ga6;s"'H( 1?lt29X gU iS!I5*?2HH}@ @6`dtPs@aM +I. +@ @pnΜuc(k?@ F6XPed٣20\#^fƎV@ 0@PA=o01=["@tv%i@@iED@ x +! P(ԺT09t:$?ױqC64 3 ԜҎzx3ѾiRG7cl} EX +@p0(i@Q袇G9:f~sc. @%:K @@T p\@yt9 !>I r2 +$Rih`iWVkUv +³#4B䀗#/-@X@,~Oo h.l@5w=CpH1 + 0D 0~ _e  SS\7^h}FZw߫‘pX +ueD[71Kd.'G|9Yly'ԛ Ð8H8C8X t-IJ pnX{@v"_f?k ށ/@6#(֎`8a ,HljHI5 ~op){4=/谣1C@b 0P@P$2 &@40v2@JXeyf~COBL `́@D D4'^IG +unldɤvEemcʬ@*҉!)`L|%@4Nv D(sqa|q5j@DcXVCA/Vڥ)axF B$v)$BK't%9r#Xz`He`:""B&Zvz0',~f' w u 9c[9@) +Qp7^l c #D3AC24", +", c #D1AB28", +"' c #D4AE2B", +") c #D5B02E", +"! c #D5B032", +"~ c #D6B133", +"{ c #D7B12E", +"] c #D7B428", +"^ c #D6B727", +"/ c #D2B425", +"( c #C09A1E", +"_ c #CCA621", +": c #D0A921", +"< c #CEA823", +"[ c #BCAA33", +"} c #85AC7F", +"| c #7EB098", +"1 c #87B69E", +"2 c #8FB7A2", +"3 c #94BBA4", +"4 c #98BDA6", +"5 c #9EBDA4", +"6 c #9AB798", +"7 c #95AA80", +"8 c #9AA55E", +"9 c #C3A83A", +"0 c #CFA628", +"a c #D4AD23", +"b c #DCBB27", +"c c #C9A520", +"d c #D0A41F", +"e c #CE9F21", +"f c #8CAA50", +"g c #7DAA8E", +"h c #77AD96", +"i c #5DB5B4", +"j c #6BBBC0", +"k c #8BCACE", +"l c #9FD3D7", +"m c #A4D5D8", +"n c #AAD7D8", +"o c #ACD7D6", +"p c #ABD2CD", +"q c #A4C9BF", +"r c #9AB9A6", +"s c #89A170", +"t c #B2A03B", +"u c #C99C22", +"v c #D5AE24", +"w c #DEBE28", +"x c #C79C1D", +"y c #D4B023", +"z c #CBA624", +"A c #9CAA47", +"B c #78AA93", +"C c #5DADA7", +"D c #4FADB0", +"E c #5FB7BA", +"F c #80C5C9", +"G c #99CED2", +"H c #ABD8DA", +"I c #B4DBDC", +"J c #B7DCDE", +"K c #B7DEDF", +"L c #BDE0E0", +"M c #C0E1E1", +"N c #C1E0E0", +"O c #BBDEDF", +"P c #ADD7D7", +"Q c #9AC8C2", +"R c #8FB4A3", +"S c #829C6C", +"T c #9CA048", +"U c #CE9F1F", +"V c #DBBB26", +"W c #C49B1D", +"X c #D3AC22", +"Y c #BF9E28", +"Z c #78A16D", +"` c #65A89C", +" . c #4CAAAD", +".. c #4AAAB2", +"+. c #5BB2B7", +"@. c #68B7BD", +"#. c #86C5C9", +"$. c #9AD1D2", +"%. c #A3D3D6", +"&. c #ADD8DA", +"*. c #B2DADC", +"=. c #B6DCDC", +"-. c #B7DCDC", +";. c #B7DBDB", +">. c #B6D8D7", +",. c #ADD5D1", +"'. c #9FD0CE", +"). c #8CC4C5", +"!. c #81BAB5", +"~. c #7BAC9F", +"{. c #7B9B66", +"]. c #C8921D", +"^. c #D9B526", +"/. c #C0991C", +"(. c #BD9C28", +"_. c #779A66", +":. c #5AA39F", +"<. c #49A2AA", +"[. c #4CA4AF", +"}. c #52ABB2", +"|. c #5DB2B7", +"1. c #70BBBD", +"2. c #82C3C5", +"3. c #90CACD", +"4. c #9ACED1", +"5. c #9FD1D5", +"6. c #A7D5D8", +"7. c #ACD7D8", +"8. c #AFD8DA", +"9. c #ADD7D8", +"0. c #ADD7D6", +"a. c #ABD3D2", +"b. c #A3CEC9", +"c. c #98C7C4", +"d. c #8AC2C3", +"e. c #80BBBF", +"f. c #77B6BA", +"g. c #69AAA8", +"h. c #799874", +"i. c #C8911B", +"j. c #DBBB25", +"k. c #D4B123", +"l. c #CD9A1E", +"m. c #939B44", +"n. c #609990", +"o. c #4596A2", +"p. c #4A9EAA", +"q. c #4FA3AD", +"r. c #58ABB1", +"s. c #62AFB4", +"t. c #6EB7B9", +"u. c #7DBFC2", +"v. c #87C7C9", +"w. c #91C9CE", +"x. c #98CED1", +"y. c #9FD0D3", +"z. c #A3D2D6", +"A. c #A6D3D7", +"B. c #A7D5D6", +"C. c #A6D3D5", +"D. c #A3D2D1", +"E. c #9ECAC9", +"F. c #91C3C0", +"G. c #89BEBB", +"H. c #80B9BB", +"I. c #7BB7BA", +"J. c #6EACB6", +"K. c #60A1A1", +"L. c #76996B", +"M. c #C79B24", +"N. c #DEBF29", +"O. c #C79E1D", +"P. c #AC9D37", +"Q. c #719580", +"R. c #4F969A", +"S. c #4896A4", +"T. c #53A1AA", +"U. c #57A4AC", +"V. c #5DAAAF", +"W. c #64B0B2", +"X. c #6BB5B7", +"Y. c #75BABF", +"Z. c #80C0C5", +"`. c #89C3CA", +" + c #90C8CD", +".+ c #94C9CE", +"++ c #99CCD2", +"@+ c #9CD0D3", +"#+ c #9ECED3", +"$+ c #9DCED2", +"%+ c #9CCDCE", +"&+ c #96CACA", +"*+ c #8FC4C2", +"=+ c #87BDBB", +"-+ c #7EB7B7", +";+ c #79B5B6", +">+ c #73AFB6", +",+ c #62A2AD", +"'+ c #669C96", +")+ c #A39D40", +"!+ c #D6B223", +"~+ c #D6B624", +"{+ c #D8B425", +"]+ c #C99B1E", +"^+ c #78945C", +"/+ c #529195", +"(+ c #45919F", +"_+ c #4C96A4", +":+ c #559FA8", +"<+ c #57A3AA", +"[+ c #5DA6AC", +"}+ c #62ACB1", +"|+ c #6AB1B7", +"1+ c #72B7BD", +"2+ c #78BBC3", +"3+ c #7EBDC5", +"4+ c #83C3C9", +"5+ c #8BC5CC", +"6+ c #8EC5CD", +"7+ c #93C8CE", +"8+ c #91C8CD", +"9+ c #91C9CA", +"0+ c #90C7C9", +"a+ c #86BDBD", +"b+ c #7CB5B7", +"c+ c #77B1B2", +"d+ c #70ADB1", +"e+ c #70ACAF", +"f+ c #5899A1", +"g+ c #799C79", +"h+ c #D2A721", +"i+ c #D4B628", +"j+ c #AE7511", +"k+ c #BD9726", +"l+ c #74957F", +"m+ c #458C9C", +"n+ c #4591A4", +"o+ c #4C95A3", +"p+ c #4F9AA4", +"q+ c #529CA7", +"r+ c #58A2AB", +"s+ c #5DAAB1", +"t+ c #62ACB5", +"u+ c #6AB4BB", +"v+ c #6EB6BF", +"w+ c #75B7C2", +"x+ c #79BDC5", +"y+ c #7EBDC7", +"z+ c #83C0C8", +"A+ c #85C0C8", +"B+ c #86C3C9", +"C+ c #87C0C8", +"D+ c #87C2C5", +"E+ c #86C0C3", +"F+ c #83BDBE", +"G+ c #77B2B6", +"H+ c #72ADB2", +"I+ c #69A6AC", +"J+ c #66A6AD", +"K+ c #5699A4", +"L+ c #6A9A91", +"M+ c #C49C23", +"N+ c #DEBE27", +"O+ c #9A680F", +"P+ c #D8B825", +"Q+ c #ABA53A", +"R+ c #629489", +"S+ c #448A9A", +"T+ c #4791A4", +"U+ c #4A95A3", +"V+ c #4E96A3", +"W+ c #4F99A4", +"X+ c #55A3AA", +"Y+ c #58AAB0", +"Z+ c #5DAAB4", +"`+ c #62ADB7", +" @ c #66B2BB", +".@ c #6AB2BD", +"+@ c #6FB7BF", +"@@ c #72B7C0", +"#@ c #75B9C3", +"$@ c #79BBC4", +"%@ c #7BBBC4", +"&@ c #7CBDC3", +"*@ c #7DBBC2", +"=@ c #7EBDC0", +"-@ c #7EBBBF", +";@ c #7EBBBB", +">@ c #75B2B5", +",@ c #73B1B2", +"'@ c #64A2AA", +")@ c #65A4AA", +"!@ c #5696A4", +"~@ c #5F9698", +"{@ c #BC9B29", +"]@ c #E3C228", +"^@ c #896010", +"/@ c #D5B626", +"(@ c #ADA93A", +"_@ c #629187", +":@ c #45899A", +"<@ c #4591A3", +"[@ c #4990A2", +"}@ c #4C94A1", +"|@ c #4F96A3", +"1@ c #55A2AA", +"2@ c #57A4AD", +"3@ c #58A6B1", +"4@ c #5BA8B4", +"5@ c #5DAAB6", +"6@ c #62ADB9", +"7@ c #66B0BB", +"8@ c #69AFBB", +"9@ c #6BB1BE", +"0@ c #70B5BF", +"a@ c #70B6BE", +"b@ c #74B7BD", +"c@ c #75B9BD", +"d@ c #78B7BB", +"e@ c #79B9BA", +"f@ c #75B2B2", +"g@ c #629DAA", +"h@ c #66A1A8", +"i@ c #5591A4", +"j@ c #669894", +"k@ c #BC9F2D", +"l@ c #E3BD24", +"m@ c #9D6A10", +"n@ c #D3B024", +"o@ c #B9A732", +"p@ c #749782", +"q@ c #498793", +"r@ c #458E9F", +"s@ c #4C91A1", +"t@ c #4F95A2", +"u@ c #529FA7", +"v@ c #55A3AD", +"w@ c #56A4B1", +"x@ c #58A4B2", +"y@ c #5AA7B5", +"z@ c #5CABB7", +"A@ c #5FADB7", +"B@ c #64ACB9", +"C@ c #66ADB9", +"D@ c #68B0B9", +"E@ c #6BB2B9", +"F@ c #6FB4B7", +"G@ c #72B5B7", +"H@ c #73B2B6", +"I@ c #75B5B2", +"J@ c #74B0B1", +"K@ c #66A4AA", +"L@ c #6AA3A7", +"M@ c #58919A", +"N@ c #78966A", +"O@ c #CCA325", +"P@ c #E2C127", +"Q@ c #DCB620", +"R@ c #945B0C", +"S@ c #C1911C", +"T@ c #D3B528", +"U@ c #84A25D", +"V@ c #558C91", +"W@ c #438AA2", +"X@ c #4891A3", +"Y@ c #4A90A1", +"Z@ c #4A939F", +"`@ c #4F98A3", +" # c #529CA6", +".# c #53A1AC", +"+# c #55A1AF", +"@# c #55A3B1", +"## c #56A4B2", +"$# c #57A8B4", +"%# c #58A6B4", +"&# c #5CA8B2", +"*# c #5DA8B4", +"=# c #61ABB4", +"-# c #66ABB2", +";# c #6AAFB4", +"># c #6BB0B2", +",# c #6DB1B2", +"'# c #70B1AD", +")# c #6FADAD", +"!# c #6EAAAB", +"~# c #669FA2", +"{# c #6B9991", +"]# c #A89D3B", +"^# c #DBB624", +"/# c #DEBD23", +"(# c #90560A", +"_# c #B57A14", +":# c #C4AE33", +"<# c #7EA18B", +"[# c #498C9F", +"}# c #458EA4", +"|# c #49919F", +"1# c #4A919F", +"2# c #4F99A1", +"3# c #539DA6", +"4# c #519EAC", +"5# c #4F9FAD", +"6# c #4FA1AF", +"7# c #4FA2B1", +"8# c #52A2B1", +"9# c #55A2B0", +"0# c #57A3AD", +"a# c #5CA4AF", +"b# c #5DA8AF", +"c# c #62AAAF", +"d# c #62AAAD", +"e# c #66ACAD", +"f# c #6AADAC", +"g# c #6AABAA", +"h# c #6AA4A4", +"i# c #6D9A95", +"j# c #849651", +"k# c #CFA422", +"l# c #E3C126", +"m# c #DEB821", +"n# c #B27011", +"o# c #C48A19", +"p# c #B9B540", +"q# c #739F93", +"r# c #4A8C9F", +"s# c #488CA3", +"t# c #4C919D", +"u# c #4E949E", +"v# c #519AA3", +"w# c #4F98A4", +"x# c #4E9CA7", +"y# c #4C9AAB", +"z# c #4D9EAC", +"A# c #4C9CAD", +"B# c #4E9FAD", +"C# c #529FAB", +"D# c #559FAB", +"E# c #56A2AB", +"F# c #58A3AA", +"G# c #5DA6AA", +"H# c #61AAAA", +"I# c #64A7A4", +"J# c #62A3A1", +"K# c #6A9A95", +"L# c #809658", +"M# c #CAA123", +"N# c #DFBE26", +"O# c #E5BE24", +"P# c #E2BC23", +"Q# c #A5630D", +"R# c #B97411", +"S# c #C7901A", +"T# c #AEB547", +"U# c #80AA93", +"V# c #5D9A9D", +"W# c #4D909E", +"X# c #4E8F9D", +"Y# c #56989F", +"Z# c #5A9FA4", +"`# c #5CA4A7", +" $ c #4A96AA", +".$ c #4A9AAB", +"+$ c #4A9DAC", +"@$ c #4C9AAA", +"#$ c #4E9AAA", +"$$ c #4F9AA7", +"%$ c #559EA4", +"&$ c #5BA2A2", +"*$ c #6A9D93", +"=$ c #759C8B", +"-$ c #889A52", +";$ c #DDBC26", +">$ c #E5B922", +",$ c #E1BB22", +"'$ c #AA660F", +")$ c #BC7613", +"!$ c #D2AF23", +"~$ c #C5BD3A", +"{$ c #8BB16C", +"]$ c #86AD95", +"^$ c #6FA699", +"/$ c #5C9FA1", +"($ c #5B9FA4", +"_$ c #62AAA7", +":$ c #58A1A4", +"<$ c #4A98A6", +"[$ c #499AA8", +"}$ c #4999AA", +"|$ c #4A9AAA", +"1$ c #4A96A7", +"2$ c #4A96A4", +"3$ c #4A95A2", +"4$ c #569A9F", +"5$ c #609D9A", +"6$ c #759D87", +"7$ c #809B59", +"8$ c #AEA53D", +"9$ c #D2B027", +"0$ c #DEBE2B", +"a$ c #E4B821", +"b$ c #E3B822", +"c$ c #B0680D", +"d$ c #BE7813", +"e$ c #CC9D1F", +"f$ c #D0AF29", +"g$ c #CEBE35", +"h$ c #A3BA4E", +"i$ c #8CB191", +"j$ c #8AB198", +"k$ c #75AA9A", +"l$ c #5D9FA2", +"m$ c #4991A4", +"n$ c #4494AB", +"o$ c #4195AD", +"p$ c #4193AD", +"q$ c #4193AB", +"r$ c #4D919C", +"s$ c #659F9A", +"t$ c #7EA088", +"u$ c #7C9F62", +"v$ c #B4A637", +"w$ c #D0B32D", +"x$ c #D5B72A", +"y$ c #DBBC2A", +"z$ c #E2C851", +"A$ c #EAD16D", +"B$ c #E3BF32", +"C$ c #D9B022", +"D$ c #9B5E0D", +"E$ c #B26B0F", +"F$ c #BB7112", +"G$ c #BD7714", +"H$ c #C68B19", +"I$ c #CD9E1E", +"J$ c #D3B126", +"K$ c #CABE37", +"L$ c #B5BD45", +"M$ c #89AF72", +"N$ c #89AD91", +"O$ c #79A896", +"P$ c #83AA91", +"Q$ c #86AA8E", +"R$ c #86A78C", +"S$ c #82A684", +"T$ c #83A674", +"U$ c #9EAF4C", +"V$ c #BFB73C", +"W$ c #D0BB31", +"X$ c #D5BC30", +"Y$ c #DFBF2A", +"Z$ c #D7BC28", +"`$ c #DABF51", +" % c #EAD995", +".% c #DFBC42", +"+% c #CC9E23", +"@% c #B88520", +"#% c #9A5716", +"$% c #9F5F0C", +"%% c #B4680F", +"&% c #BA7011", +"*% c #C9921C", +"=% c #D4B227", +"-% c #D6C02F", +";% c #D2C135", +">% c #CBC63E", +",% c #D1C136", +"'% c #D4BF33", +")% c #D5C032", +"!% c #D8BE2D", +"~% c #D7BD30", +"{% c #DABF29", +"]% c #E0BF25", +"^% c #DCBC27", +"/% c #D9B522", +"(% c #CFAD22", +"_% c #CCAA23", +":% c #CFAF2E", +"<% c #D0AA45", +"[% c #C5852A", +"}% c #B96B1E", +"|% c #AC5F1B", +"1% c #994814", +"2% c #9B4B16", +"3% c #924313", +"4% c #B0660F", +"5% c #B66D0F", +"6% c #BE7311", +"7% c #C27B15", +"8% c #CB8F1A", +"9% c #D1A11E", +"0% c #D29D1F", +"a% c #D5A420", +"b% c #D7AA20", +"c% c #DAAC21", +"d% c #DBB222", +"e% c #DDB322", +"f% c #DDB824", +"g% c #DEB31F", +"h% c #E0B41D", +"i% c #D9AF1E", +"j% c #C89E1D", +"k% c #BC951D", +"l% c #C6A623", +"m% c #C4A023", +"n% c #AC7B1B", +"o% c #A45419", +"p% c #AC5019", +"q% c #AE5119", +"r% c #AD551A", +"s% c #A9531A", +"t% c #954414", +"u% c #82370E", +"v% c #A9660D", +"w% c #BF7412", +"x% c #C37B14", +"y% c #C88315", +"z% c #CB8916", +"A% c #CF9016", +"B% c #D39716", +"C% c #D69A19", +"D% c #D8A019", +"E% c #D9A51A", +"F% c #DAA71B", +"G% c #DCA81B", +"H% c #DBA71C", +"I% c #DBAC1C", +"J% c #CFA21A", +"K% c #B98A18", +"L% c #9F7016", +"M% c #BF9C20", +"N% c #B9921C", +"O% c #894F10", +"P% c #833C12", +"Q% c #964215", +"R% c #A54D18", +"S% c #BE5F1F", +"T% c #B3581C", +"U% c #994416", +"V% c #853910", +"W% c #722E0C", +"X% c #AD6611", +"Y% c #C27A13", +"Z% c #C78214", +"`% c #CA8815", +" & c #D19218", +".& c #D39818", +"+& c #D59E18", +"@& c #D79F18", +"#& c #D7A01A", +"$& c #D19F18", +"%& c #C79519", +"&& c #936C14", +"*& c #63430A", +"=& c #967313", +"-& c #AD861C", +";& c #7C470F", +">& c #692D0C", +",& c #76330F", +"'& c #974616", +")& c #B0531B", +"!& c #9B3C12", +"~& c #9D4012", +"{& c #903B11", +"]& c #82350F", +"^& c #792F0C", +"/& c #B46A10", +"(& c #B66E10", +"_& c #BB7412", +":& c #C27D10", +"<& c #C78112", +"[& c #CA8713", +"}& c #CD8E14", +"|& c #CC8E16", +"1& c #CE8F16", +"2& c #D29616", +"3& c #452E05", +"4& c #865D0D", +"5& c #774D0E", +"6& c #643209", +"7& c #562507", +"8& c #4F2006", +"9& c #813A10", +"0& c #954514", +"a& c #913F12", +"b& c #AA4B17", +"c& c #A14111", +"d& c #9B3F12", +"e& c #9E4A17", +"f& c #A45517", +"g& c #9D4C18", +"h& c #4B1C04", +"i& c #401803", +"j& c #461C05", +"k& c #70330B", +"l& c #70300D", +"m& c #813B10", +"n& c #883B11", +"o& c #933810", +"p& c #BA5C1D", +"q& c #BF6122", +"r& c #B55A1E", +"s& c #984B17", +"t& c #79310E", +"u& c #7A300D", +"v& c #542303", +"w& c #602807", +"x& c #5A2709", +"y& c #652A0A", +"z& c #7D3910", +"A& c #A04F19", +"B& c #AF561A", +"C& c #B75B1E", +"D& c #B4511B", +"E& c #9E4113", +"F& c #893810", +"G& c #80330D", +"H& c #964617", +"I& c #552305", +"J& c #582507", +"K& c #6A2F0B", +"L& c #7A3A0F", +"M& c #894212", +"N& c #863D11", +"O& c #A54014", +"P& c #A04113", +"Q& c #A24C19", +"R& c #A5561C", +"S& c #9B4A19", +"T& c #602B08", +"U& c #612908", +"V& c #5B2708", +"W& c #672D0A", +"X& c #672C0C", +"Y& c #6A2A0B", +"Z& c #A64515", +"`& c #BF5C20", +" * c #BD6422", +".* c #AE571D", +"+* c #A45119", +"@* c #A2511B", +"#* c #502206", +"$* c #4C2005", +"%* c #451B04", +"&* c #542107", +"** c #793710", +"=* c #742F0C", +"-* c #CA6B25", +";* c #C16624", +">* c #9E4E19", +",* c #A4551A", +"'* c #381403", +")* c #371502", +"!* c #5A2509", +"~* c #7C3B0F", +"{* c #864011", +"]* c #954814", +"^* c #AA551D", +"/* c #B96120", +"(* c #C66525", +"_* c #BA5D1F", +":* c #9F4616", +"<* c #934114", +"[* c #A5551B", +"}* c #A05217", +"|* c #391602", +"1* c #5F2908", +"2* c #6B310A", +"3* c #5C2808", +"4* c #692F0C", +"5* c #954916", +"6* c #9D4D18", +"7* c #B65F1F", +"8* c #BC5E1F", +"9* c #A84615", +"0* c #A64917", +"a* c #A85219", +"b* c #A2501A", +"c* c #572306", +"d* c #421905", +"e* c #4D1F04", +"f* c #5E2807", +"g* c #7D3C10", +"h* c #7D3710", +"i* c #9F4E18", +"j* c #B0581D", +"k* c #A44917", +"l* c #AC4B17", +"m* c #984213", +"n* c #AC561D", +"o* c #9C4C17", +"p* c #431904", +"q* c #552406", +"r* c #602A09", +"s* c #72330D", +"t* c #9A4D19", +"u* c #9C4917", +"v* c #A64E19", +"w* c #A14214", +"x* c #A44715", +"y* c #B65B1F", +"z* c #AA541B", +"A* c #8B3E13", +"B* c #823A10", +"C* c #492205", +"D* c #522205", +"E* c #542207", +"F* c #843C11", +"G* c #924715", +"H* c #984717", +"I* c #873710", +"J* c #B65A1D", +"K* c #BF621E", +"L* c #AB4F18", +"M* c #903F13", +"N* c #7A370F", +"O* c #6E310D", +"P* c #3F1903", +"Q* c #351401", +"R* c #441A05", +"S* c #562307", +"T* c #73320E", +"U* c #8A4313", +"V* c #984513", +"W* c #833910", +"X* c #662C0A", +"Y* c #381603", +"Z* c #7C380F", +"`* c #884111", +" = c #974814", +".= c #9C4B15", +"+= c #904213", +"@= c #71330E", +"#= c #5D290A", +"$= c #562708", +"%= c #582506", +"&= c #5A2806", +"*= c #6E300B", +"== c #79360E", +"-= c #74350F", +";= c #672F0A", +">= c #471F06", +",= c #4E2105", +"'= c #522107", +")= c #502107", +"!= c #5F2B08", +"~= c #451C04", +"{= c #481E05", +"]= c #411904", +"^= c #391702", +"/= c #3C1A01", +"(= c #481E02", +"_= c #431900", +":= c #381401", +"<= c #250D00", +"[= c #2C1201", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" ", +" . + @ # # $ % ", +" & * = - ; > , ' ) ! ~ { ] ^ / ", +" ( _ : < [ } | 1 2 3 4 5 6 7 8 9 0 a b ", +" c d e f g h i j k l m m n o p q r s t u v w ", +" x y z A B C D E F G H I J K L M N O P Q R S T U V ", +" W X Y Z ` ...+.@.#.$.%.n &.*.=.-.;.>.,.'.).!.~.{.].^. ", +" /.: (._.:.<.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.f.g.h.i.j. ", +" k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N. ", +" O.X P.Q.R.S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+!+~+ ", +" {+]+^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+w.7+8+9+0+).a+b+c+d+e+f+g+h+i+ ", +" j+{+k+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+B+C+D+D+E+F+G+H+I+J+K+L+M+N+ ", +" O+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@'@)@!@~@{@]@ ", +" ^@/@(@_@:@<@[@}@|@1@2@3@4@5@6@7@8@9@v+0@a@b@c@d@e@>@f@g@h@i@j@k@]@l@ ", +" m@n@o@p@q@r@[@s@t@u@v@v@w@x@y@z@A@6@B@C@D@E@F@G@H@I@J@K@L@M@N@O@P@Q@ ", +" R@S@T@U@V@W@X@Y@Z@`@ #T..#+#@###$#%#&#*#=#-#;#>#,#'#)#!#~#{#]#^#/# ", +" (#_#a :#<#[#}#[@|#1#2#3#T.4#5#6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#k#l#m# ", +" n#o#X p#q#r#s#|#t#u#v#w#x#y#z#A#B#5#C#D#E#F#G#H#I#J#K#L#M#N#O#P# ", +" Q#R#S#X T#U#V#W#X#Y#Z#`#W+ $.$.$+$@$#$$$q+3#%$&$*$=$-$O@;$O#>$,$ ", +" '$)$S#!$~${$]$^$/$($_$:$<$[$}$|$1$<$2$3$4$5$6$7$8$9$0$P@a$b$ ", +" c$d$o#e$f$g$h$i$j$k$l$m$n$o$p$q$n+r$s$t$u$v$w$x$y$z$A$B$C$ ", +" D$E$F$G$H$I$J$K$g$L$M$N$O$P$Q$R$S$T$U$V$W$X$Y$Z$> `$ %.%+%@%#% ", +" $%%%&%F$d$o#*%U =%-%;%>%,%'%'%)%!%~%{%]%^%/%(%_%:%<%[%}%|%1%2%3% ", +" 4%5%&%F$6%7%8%9%0%a%b%c%d%e%e%f%g%h%i%j%k%l%m%n%o%p%q%r%s%t%u% ", +" v%E$&%&%w%x%y%z%A%B%C%D%E%F%G%H%I%J%K%L%M%N%O%P%Q%R%S%T%U%V%W% ", +" X%%%&%6%Y%Z%`%A% &.&+&@&D%#&$&%&&&*&=&-&;&>&,&'&)&!&~&{&]&^& ", +" /&(&_&:&<&[&}&|&1&2& 3&4&5&6&7&8&9&0&a&b&c&d&e&f&g& ", +" h&i&j&k&l&m&n&o&p&q&r&s&t&u& ", +" v&w&x&y&z&A&B&C&D&E&F&G&H& ", +" I&J&K&L&M&N&Q%d&O&P&Q&R&S& ", +" T&U&V&W&X&Y&]&{&Z&`& *.*+*@* ", +" #*$*%*&***=*s%q&-*;*s%>*,* ", +" '*)*!*~*{*]*^*/*(*_*:*<*[*}* ", +" |*1*2*3*4*5*6*7*8*9*0*a*+*b* ", +" c*d*e*f*g*h*i*j*k*C&l*m*n*o* ", +" p*q*W&r*s*t*u*v*w*x*y*z*A*B* ", +" C*D*j&E*F*G*H*I*J*K*L*M*N*O* ", +" P*Q*R*S*T*U*H*s%p%V*W*4*X* ", +" Y*r*k&Z*`* =.=+=@=#=$= ", +" %=&=3*W&*===~*-=;= ", +" >=,=7&7&'=)=!= ", +" ~={=]=^=/= ", +" (=_=:=Y* ", +" <=<=[= ", +" ", +" "}; diff -Naur WindowMaker-0.91.0/WindowMaker/Icons/Makefile.in wm/WindowMaker/Icons/Makefile.in --- WindowMaker-0.91.0/WindowMaker/Icons/Makefile.in 2004-10-26 08:10:47 +0400 +++ wm/WindowMaker/Icons/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,244 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -defsdatadir = $(pkgdatadir)/Icons - -defsdata_DATA = BitchX.tiff DefaultAppIcon.tiff Ftp.png GNUstep.tiff GNUstep3D.tiff GNUstepGlow.tiff GNUterm.tiff GreenWilber.png ICQ.png Jabber.png Mozilla.png Netscape.png Pen.png Pencil.png Real.png Shell.png Speaker.png Terminal.tiff TerminalGNUstep.tiff TerminalLinux.tiff XChat.png clip.tiff defaultAppIcon.tiff defaultterm.tiff draw.tiff linuxterm.tiff mixer.tiff notepad.tiff pdf.tiff ps.tiff real.tiff sgiterm.tiff sound.tiff staroffice2.tiff timer.tiff wilber.tiff write.tiff xdvi.tiff xv.tiff BitchX.xpm GNUstep.xpm GNUstep3D.xpm GNUstepGlow.xpm GNUterm.xpm Terminal.xpm TerminalGNUstep.xpm TerminalLinux.xpm clip.xpm defaultAppIcon.xpm defaultterm.xpm draw.xpm linuxterm.xpm mixer.xpm notepad.xpm pdf.xpm ps.xpm real.xpm sgiterm.xpm sound.xpm staroffice2.xpm timer.xpm wilber.xpm write.xpm xdvi.xpm xv.xpm - - -EXTRA_DIST = $(defsdata_DATA) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -DATA = $(defsdata_DATA) - -DIST_COMMON = README Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Icons/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-defsdataDATA: $(defsdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(defsdatadir) - @list='$(defsdata_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defsdatadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defsdatadir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(defsdatadir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(defsdatadir)/$$p; \ - fi; fi; \ - done - -uninstall-defsdataDATA: - @$(NORMAL_UNINSTALL) - list='$(defsdata_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(defsdatadir)/$$p; \ - done -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WindowMaker/Icons - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-defsdataDATA -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-defsdataDATA -uninstall: uninstall-am -all-am: Makefile $(DATA) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(defsdatadir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: uninstall-defsdataDATA install-defsdataDATA tags distdir info-am \ -info dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WindowMaker/Icons/Mouth.png wm/WindowMaker/Icons/Mouth.png --- WindowMaker-0.91.0/WindowMaker/Icons/Mouth.png 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Icons/Mouth.png 2002-01-26 18:56:26 +0300 @@ -0,0 +1,40 @@ +PNG + + IHDR@@iqgAMA abKGD pHYs  tIMEG{IDATxkv#َ?`N xh +AU Qy)SkG Ee2,h*(AFY͠,-LE|Y#AfF32UoR B-ᛪ\)Fժ)U@ׂu("*ZEfsґ ER%ml*CT U쳺8N+s*)JK9G˄ȗ!gHPuEV;*߄.7R%tFVadG23<أ8\'m +tw(E*IQT RIHBD*$0Ĥ*L?U D]P.@BqAJU">g*SČ**)0g?w#L$iY`t75TՕ%թQ&RlS(L(!e"GQʺÆxUJSS5!R*[/UT$eQU111Ė*d"떮%(-XL:" ," +U)@27UW{oq6?ÏYۡnUiX!VIu 8+SunK%d q jwѬ +U]- USI1;D J 3`21Rr -uIJ8RNL+֎uJV6p(s<"IAeG#o9S,ɾĪ"B0D]WQ +B#-Ub"ZjPE.x!' ZtT +"dt&ő|0c g0O=,`AdBBwsoZj"b{QfGҨS!".)ZNYP{ \}y)NQPQyp?y<TDC[UqC;LUG +{3IKCb $ +0R,3֌nUv}(3Vp'dIWWuc +phA&{׃OQNӸ>'U f +QEUjl` +"#@pr&biw)+ +(I +R%RTĕzFE0̙#?z4'e%ps||=|6"ȃ1Eh,A]F#n`YL;_uS#y8Φ;lC2D`U]B;WWd@Vk]4"#*f$X28d?# f\3zA£ˍ̀޹9pݰ]w"͕;?Ozps CkDJ 9%#fSFj] DCɪ YMZfg2gR ?|}}b|ܿ/'??||>\+G emS^}쉺[ݜ{*(YHO`5[QdwЯffʄօQ륡tgrw*w{F?䈨4r+rݸ6{}lkh,!i=C(T$zR7T)mV+׫TYAD1a}xe1D 3ٸL2XNg ҏYm s1P7 +_Dmc 6Sfh 'x*I*iR(Q]xaN\JllD=覧]L^6p Rf)bEhAR 놚2qs1S6wTqQ]7_PRL8%}sdX98yc?>^]z}U "E]ɞ/"2Nb| KX5%֚Ȧh5gO\ZWhVcɱH܈ f1K +bZ Dɚ?ӁDVMOi>Pl҅ +v2|0rST掩v2!RTuӂuc눘1ȥJ5䐈*1sBnE=|fRVWjP#͚IT13L sCEyt}54#(e{ZJ%!,`DzXvimFKӇ(ڤ":TR{ )rS) =f~f4Zm[Hѐ +F1ռE?O],g)K`mP]66s-eA!ٹ YasͲ9GbRO!HR6Ы#ە1\0 +lb#'uLL,RdreCccץEyMvd-:|Wf#2Ulg=f;5;" +êb!($q0p|](y@ z֘-cv{2F\7Bnnco/IoԔ 0fD=+ɜd+''~\4WyL_/sTfⶍ: +w8s69ф&5A8V>Քۆ^6ysdN *qp7$ +Cg@YlrKZ9W@#x2|C?*8$u2m9<'33&u߻6' ̂|&Cpͱ뭋7}A]u+J$ki;|?hņ +k|}GG;YTޞApT-Rgj +la5t>k.Oï?fHW" #"l\o( tEƋxl'2`D'XqF}x<}b5g+A}q<&&-D͗|!ǁGݟ rFt.?87G 8O=pzmz_Z7 K!rRR̜ MmZ`>c'}yBKWx\䜄bpzJDt*83FSc\Po|IYi0o ˭[ؼEu95Q{fU!UlE C8Gwe8H3*Ew+sZՍh˽'X"l-G`Ñmnn~oko\.VV[S5|`#HK2a'mC Q;rL?]n[mw 6nnmö6܆p5WTF KZ@dGe?Mt5`Pz}G|}N6Ud y掋`ݐɷooƜ}?8;9Uۅoo\. .-p Υ-9W9jZlK,'ךKFR3<1[KP=Z zK5Lx?>?32e|{;vA6CQ[O<ڮ>WAf֟gZ*B,dF5JYi֫o(#"wly-Rydr پЋl 69-ֵk?'e_r of6⣰ J{-ٔAy`m{v[`&Ԫ.O10T!ma*|۸}۸^o[;ku [i-je/Ɵ?9Pցʤ᩺šѝ4u@1X&k( r.̽O6j ^.ۚVZONYIya!Do*;ŀ֦Pm-m +F_pƊY}Z^/+#!DkǭZ2QQ]8;bK 1le<n t*|sh,P@G zj43<\܅FQgSܠiXAnEsf*ݸޮ,խrFk/J)5-sI + @L^s+mݢ"jYllr!+OT N$n >mdP顗Ռ.ЭFU.E:3DTKDz{6?okN KZ@'ؐDkwVVź "-[ *RFq>zY+ʬ(=9U;a-O/}^BS"* PW-1aIْ0}[cGbl@ѻ\'VG4^W~߾VqXZ +[XX<T[PnȬW6P9^;';*{-,k,7i#͹:.eH/B&Lz׼Yv"X`?|&//ꄰ@ҁ:i7bvi"+ri5Kұyb!|d6}?p>NP]a÷-%q?+LQ}ӄ$ +8x}heDl-V5L$透egn`Ѕuk:`xs3~?0VXe Ĺ0T/[焵"?xWƹs}`3>zdW_pEK'*}4Kwu"~݃CZzIn ~CQ%8_)@sNfzu9W>/ͦgyoY12/[:sS'٢J?V kaZw߯o5 X_?3~XϝZ2{=](ܓ=]%EnblDk_W_/猂=]!-O9xn2M`ݮ|l7>US0фj%hΟ%'k~̎yIENDB` \ diff -Naur WindowMaker-0.91.0/WindowMaker/Icons/Wine.png wm/WindowMaker/Icons/Wine.png --- WindowMaker-0.91.0/WindowMaker/Icons/Wine.png 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Icons/Wine.png 2002-01-27 08:59:29 +0300 @@ -0,0 +1,26 @@ +PNG + + IHDR@@iqgAMA abKGDC pHYs  d_tIME IDATxmIeWr&hfg7 #Ed)ՙ,BV Cj%F P U +h*)LN` >7cfxE]^Q9٩1@۶Z׵m+!̺X,d: uͧ:WWW꜓ե~"[[[io޼i677mUU,K +^D{ "1bi8::Jvoou]Xk )U9(ƈpΉpJQ@۶c cs.<k(R%?39gA{j8HUq6-ONNΪjs٢(UEDf1 2z^뺮ODUL) Ykc4@Dd=:km;HQbffUl9 +G|`{{{]vhgg㱫p"Rӧg}4lk5DdTRJBDmuucc<"q#cLR"D$D11EDU9,3RY""ZRUu-eY~xpۇh6FU <FIDʜZkiuAQD$9lيG+"clJ @#"DZQU֒6TaZc^G!-RXD{k;h<c̄ڶmClֆ8K)-T5F#s[nm<~?`08BDOD:%HUC!DbYj|Jɫ˅FEdDDb!\UT5GDֲVQHDc ;w߿o0F+7MLb", &AЏ1fu]\.EQ@=#X"cLBD$"Qhuc40[SJ CZEDȹ̌"B㜳"lDDŝZEѣ޹smllƘ3X.WboM^m裏̣G۷ cd>su,K`fʍ/~`fi"BhY0EQ]0WK_o]]B08"Bjrdsd޻ mmm]Zk1t:_\\L===K x}/z^i-өDDu]۪[Ϟ=RUQcfFc ρ9g1$"$"d1}#5n,1ƵTU9:PD0;;;v[[[ƘirzzzϞ?, =::??w?( +tu],jkk c3s{_޺u<::|>amhdk-""ch]{_9gB>d4DD4wtaJ wxx[׮];uΝm{9LW^-OOOlI|5˿K.9 +cL9Ea`y\ui߿O?~HDcjQff""1d23S!|kUEUz]ug>::ugggi@DuG?sDu{Uu䜻o^UU~[˟k׮ "*"J삈۸Zk: =\yTUBB`7h.ƨ)-wpp0!Q}uuiU~G}D{Q]|.d})sBķʲ|pzzm1v8>>)3o9mv8$23u؆uϠ+((MsQ@18޾wۏ?ryzyy|vyyYO&\.C4cdff???C޻ܶz6TՈDto{?u}\.mۣݟݿ_}gݻ!":{ 9M +St%έN߼ w U|^.7n<!<|yrrr9LɤY,1u]*xOOOOZKZkKϦ]C>/cІ n麎]rc<vX,1O~rd2Y&3RDD1Yk9GHh+rc^]}k>CD{L˶mf)|'ɓ~=ytKv]'o]}~]r#t:{?xYdt:]uuBʫۿ ?~{DDL)'"RcRRJƘƘι۽^ow:^u= !)@DW<_>Oe49!Y2B "+@D 8am8::zx֭?{uur$s5Ƥ(R0uwwM`Y=#m[S]c=c|idB$뺮;cLxh4Ç;˗_~_ʲV33P[v]ZTURJXk%*|޽ukc|i#"zK )DD23`0͛7IU3;DZ)"eyXkoWUug]qn8! !`ugϞ}[nɓ'c_1F`]$L۶yѽ[o6|4 9^TUD#MHYu23t]EQ6N$"4mQ^D"z8[ko@uyym;O)ZZkZeYDD۶b!1x?~Ν;?~7ƜzYD8N1` Š1FDD_zukw=־1)]zƘNUZ`Ţ({`˥u\zƘ~Q;z>8==&01^ ʪ<6mQ4r{?>xgϞ=yJoT Z";SՁTDD~wwvv>~Ѥ,˧"r,"/Z RV[0@U{o~ߍF,Z[ꐈMM_,U۶]]fU(HD""&UcB9 ׮]6ƼfD$@Pds[S޵|͵`wޝeRU1Z;.Ȉ( ""dG謵4h4rEQڞ1f软C"2l/jXtmJ\X5.KᗗhdCh4m[f{ّi>}駟G?vxxւuέ%cONN=z+cDU[pCVMuBilJWUU:h4Fc\ADizuuefمvQE|>!Uc آ(LZk]CQXE,b0TpknڶM!p||ŋ~1e=SlnS`A眙L&}EQLu+U5"RJ)VϚ _Uՠs#q!uuUt]]Gʲ DM)Rj3 {?!ʲ,19WTUUVUUlood)"k.ݾ}gϞ{"bXk-dksڶ9Z=cLcD饔v"0sKD9 wYD1`>Ksuul0L777{s @`iEDq!"&(UŦim~""GDU;;;1xqq"ǧwygv]wֶز,{9-j:[YFVU븊KAD1b'L&v>ŵk׺ι1~bf&54gU1bnll swM`$"5ƬGBDfefzd5`UıBHVJf|W^ duQZk*FQYUb>'D(c{mI`^UMJ ݻ~?lߗcxE<,KylV_)Dz17&jjX"I1@uk۔ibU툨FDo]G ycL덝sHDpXyi"^J03@sNMnnn`,Ib'4Z)% !`Z^˽JkITA0{qJy<JġMjCl[)A1^]TMe +2\/˲I)5V999 7nKD-ZH?/<@1޽{>|{oo_͝iN͇$*b 4(B1r1(hY,̤"""k-@Sx=e-˦m[]QV<"R<5W^L&׮]mf Dĥ4@YH7o|MFp81֋BbBr\N6홶-!RBev R@&Z)Eyu ''`1* ˢs;{ޟ*Dx<EQsII$b_~y:LFx\.'|pL)@ DBE|꺱[L&7zhQ1ƫ :1BdZcC% +E0Py:J;,S`y"DNbUjތij! ֭['~p<{ U$1~>l54`o2X, +PuPrJ 1 BPQVE@Y*TdTQ,` P$iXZY AQjcdH{,"AVA}4ׯwݻ7tz:f/)9Cm]?9>O&D Y^-c9`vjDbD D"U$URPDUD"@+QQPوH{5D)d"i}x]1#9`SJd|;ht9hXl]`?L(!2CDc +wiuЕ@Uc#VSlCqNZ`UTcx/ݻt~Fub`k-[kSVIz,aN}MbIιIcBHyb^51yZo={u{{VYļ +|PYE7(Or xTuuU4}gH{W8yecEX QUڽSVl*^Ĭj4ƘbQz:Cyhupzzbq8u:??~""#UˡKAs߇˙Z +QdYւYGw=fFi&qAʲ4EQآ(_]u#6u9 +LFD51*ʹ$UeMD41뚮W!꛿ƨ)1hۏIa,̕5\s`Y8|~|~t:L:f"YYv$nk.Z.n|R~Dssȷ5|]M|zv6D +y"}Q :\AFF=z9gs/¢xX=~,/;=}_,"%`WFV1u b Tw"H+6 wd+1Qݽ߸+",fnR!8眪ڔXk) %CdIO9;_:>jtz<{fگ~18=mR㔈UeߊznVoĕUx@D4DJLWA_Tggg't\lPW:}Ñ5Gx(;c Ea(L6ؘ|w8[nm> /^O\[kkcD \PJ+Z$*HAUp](^WvgƻKxgEwS]!ac ̫; ^979""ݽ{?<}wpoϞoo"], +Lq>GkUUBX-_Ĩ"iEAVd%") 0 rGZ?W,EQ].^kNs1Fn}2v&Eo<]׀7O!|ɻ7nhQT t +\sPUeMpYf6QUUB)x 1mF9IU2}͓"~W'''b{ /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-defsdataDATA -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-defsdataDATA -uninstall: uninstall-am -all-am: Makefile $(DATA) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(defsdatadir) - - -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: uninstall-defsdataDATA install-defsdataDATA tags distdir info-am \ -info dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -Default.iconset: $(top_builddir)/WindowMaker/Defaults/WMWindowAttributes - -rm -f Default.iconset - echo '{' > Default.iconset - grep Icon $(top_builddir)/WindowMaker/Defaults/WMWindowAttributes >> Default.iconset - echo '}' >> Default.iconset - chmod 644 Default.iconset - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WindowMaker/Makefile.in wm/WindowMaker/Makefile.in --- WindowMaker-0.91.0/WindowMaker/Makefile.in 2004-10-26 08:10:46 +0400 +++ wm/WindowMaker/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,350 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -SUBDIRS = Backgrounds Defaults IconSets Icons Pixmaps Styles Themes - -prefsdatadir = $(pkgdatadir) - -prefsdata_DATA = README README.themes autostart.sh exitscript.sh menu menu.bg menu.ca menu.cz menu.da menu.de menu.el menu.es menu.fi menu.fr menu.gl menu.he menu.hr menu.hu menu.it menu.ja menu.ko menu.nl menu.no menu.pl menu.pt menu.ro menu.ru menu.se menu.sk menu.sl menu.tr menu.zh_CN menu.zh_TW plmenu plmenu.bg plmenu.da plmenu.de plmenu.es plmenu.fi plmenu.fr plmenu.hr plmenu.it plmenu.ja plmenu.ko plmenu.pl plmenu.ro plmenu.sk plmenu.zh_CN plmenu.zh_TW wmmacros xtree.dat - - -EXTRA_DIST = $(prefsdata_DATA) mkMakefile -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../src/config.h -CONFIG_CLEAN_FILES = -DATA = $(prefsdata_DATA) - -DIST_COMMON = README Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-prefsdataDATA: $(prefsdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(prefsdatadir) - @list='$(prefsdata_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(prefsdatadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(prefsdatadir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(prefsdatadir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(prefsdatadir)/$$p; \ - fi; fi; \ - done - -uninstall-prefsdataDATA: - @$(NORMAL_UNINSTALL) - list='$(prefsdata_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(prefsdatadir)/$$p; \ - done - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WindowMaker - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive -check-am: all-am -check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -install-exec-am: -install-exec: install-exec-recursive - -install-data-am: install-prefsdataDATA -install-data: install-data-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: uninstall-prefsdataDATA -uninstall: uninstall-recursive -all-am: Makefile $(DATA) -all-redirect: all-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(prefsdatadir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-recursive - -clean-am: clean-tags clean-generic mostlyclean-am - -clean: clean-recursive - -distclean-am: distclean-tags distclean-generic clean-am - -rm -f libtool - -distclean: distclean-recursive - -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-recursive - -.PHONY: uninstall-prefsdataDATA install-prefsdataDATA \ -install-data-recursive uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WindowMaker/Pixmaps/CVS/Entries wm/WindowMaker/Pixmaps/CVS/Entries --- WindowMaker-0.91.0/WindowMaker/Pixmaps/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Pixmaps/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1,8 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:09 2003// +/Makefile.am/1.5/Mon Oct 25 02:32:11 2004// +/swback.png/1.2/Mon Oct 25 02:23:41 2004/-kb/ +/swback2.png/1.1/Mon Oct 25 02:32:11 2004/-kb/ +/swtile.png/1.2/Tue Oct 19 01:29:34 2004/-kb/ +/tile.tiff/1.1.1.1/Tue Sep 29 22:36:36 1998// +/tile.xpm/1.1.1.1/Tue Sep 29 22:36:36 1998// +D diff -Naur WindowMaker-0.91.0/WindowMaker/Pixmaps/CVS/Repository wm/WindowMaker/Pixmaps/CVS/Repository --- WindowMaker-0.91.0/WindowMaker/Pixmaps/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Pixmaps/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/WindowMaker/Pixmaps diff -Naur WindowMaker-0.91.0/WindowMaker/Pixmaps/CVS/Root wm/WindowMaker/Pixmaps/CVS/Root --- WindowMaker-0.91.0/WindowMaker/Pixmaps/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Pixmaps/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WindowMaker/Pixmaps/.cvsignore wm/WindowMaker/Pixmaps/.cvsignore --- WindowMaker-0.91.0/WindowMaker/Pixmaps/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Pixmaps/.cvsignore 2003-04-02 15:37:09 +0400 @@ -0,0 +1,2 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WindowMaker/Pixmaps/Makefile.in wm/WindowMaker/Pixmaps/Makefile.in --- WindowMaker-0.91.0/WindowMaker/Pixmaps/Makefile.in 2004-10-26 08:10:47 +0400 +++ wm/WindowMaker/Pixmaps/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,244 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -defsdatadir = $(pkgdatadir)/Pixmaps - -defsdata_DATA = tile.tiff tile.xpm swtile.png swback.png swback2.png - - -EXTRA_DIST = $(defsdata_DATA) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -DATA = $(defsdata_DATA) - -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Pixmaps/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-defsdataDATA: $(defsdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(defsdatadir) - @list='$(defsdata_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defsdatadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defsdatadir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(defsdatadir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(defsdatadir)/$$p; \ - fi; fi; \ - done - -uninstall-defsdataDATA: - @$(NORMAL_UNINSTALL) - list='$(defsdata_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(defsdatadir)/$$p; \ - done -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WindowMaker/Pixmaps - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-defsdataDATA -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-defsdataDATA -uninstall: uninstall-am -all-am: Makefile $(DATA) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(defsdatadir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: uninstall-defsdataDATA install-defsdataDATA tags distdir info-am \ -info dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WindowMaker/Sounds/CVS/Entries wm/WindowMaker/Sounds/CVS/Entries --- WindowMaker-0.91.0/WindowMaker/Sounds/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Sounds/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +D diff -Naur WindowMaker-0.91.0/WindowMaker/Sounds/CVS/Repository wm/WindowMaker/Sounds/CVS/Repository --- WindowMaker-0.91.0/WindowMaker/Sounds/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Sounds/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/WindowMaker/Sounds diff -Naur WindowMaker-0.91.0/WindowMaker/Sounds/CVS/Root wm/WindowMaker/Sounds/CVS/Root --- WindowMaker-0.91.0/WindowMaker/Sounds/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Sounds/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WindowMaker/Styles/CVS/Entries wm/WindowMaker/Styles/CVS/Entries --- WindowMaker-0.91.0/WindowMaker/Styles/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Styles/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1,38 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:09 2003// +/Autumn.style/1.5/Fri Oct 22 00:21:52 2004// +/Black.style/1.3/Fri Oct 22 00:21:52 2004// +/BlackTexture.style/1.3/Fri Oct 22 00:21:52 2004// +/Blue.style/1.5/Fri Oct 22 00:21:52 2004// +/BlueDawn.style/1.4/Fri Oct 22 00:21:52 2004// +/BlueishGreen.style/1.3/Fri Oct 22 00:21:52 2004// +/Brown.style/1.3/Fri Oct 22 00:21:52 2004// +/Brownish.style/1.3/Fri Oct 22 00:21:52 2004// +/Chumbo.style/1.3/Fri Oct 22 00:21:52 2004// +/Copper.style/1.3/Fri Oct 22 00:21:52 2004// +/DarkBlue.style/1.3/Fri Oct 22 00:21:52 2004// +/DarkRed.style/1.4/Fri Oct 22 00:21:52 2004// +/Emerald.style/1.4/Fri Oct 22 00:21:52 2004// +/Fire.style/1.4/Fri Oct 22 00:21:52 2004// +/Food.style/1.3/Fri Oct 22 00:21:52 2004// +/Golden.style/1.4/Fri Oct 22 00:21:52 2004// +/Green.style/1.4/Fri Oct 22 00:21:52 2004// +/GreyBlue.style/1.4/Fri Oct 22 00:21:52 2004// +/Gtk.style/1.3/Fri Oct 22 00:21:52 2004// +/IRednBlue.style/1.4/Fri Oct 22 00:21:52 2004// +/Interlace.style/1.3/Fri Oct 22 00:21:52 2004// +/LightBlue.style/1.4/Fri Oct 22 00:21:52 2004// +/Makefile.am/1.10/Fri Jan 5 21:29:26 2001// +/NewBlue.style/1.4/Fri Oct 22 00:21:52 2004// +/NightSky.style/1.4/Fri Oct 22 00:21:52 2004// +/Pastel.style/1.4/Fri Oct 22 00:21:52 2004// +/Pink.style/1.3/Fri Oct 22 00:21:52 2004// +/Pumpkin.style/1.4/Fri Oct 22 00:21:52 2004// +/Purple.style/1.3/Fri Oct 22 00:21:52 2004// +/Purplish.style/1.4/Fri Oct 22 00:21:52 2004// +/Red.style/1.4/Fri Oct 22 00:21:52 2004// +/RednBlue.style/1.4/Fri Oct 22 00:21:52 2004// +/Spring.style/1.4/Fri Oct 22 00:21:52 2004// +/Summer.style/1.4/Fri Oct 22 00:21:52 2004// +/Traditional.style/1.4/Fri Oct 22 00:21:52 2004// +/VioletBlue.style/1.3/Fri Oct 22 00:21:52 2004// +D diff -Naur WindowMaker-0.91.0/WindowMaker/Styles/CVS/Repository wm/WindowMaker/Styles/CVS/Repository --- WindowMaker-0.91.0/WindowMaker/Styles/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Styles/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/WindowMaker/Styles diff -Naur WindowMaker-0.91.0/WindowMaker/Styles/CVS/Root wm/WindowMaker/Styles/CVS/Root --- WindowMaker-0.91.0/WindowMaker/Styles/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Styles/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WindowMaker/Styles/.cvsignore wm/WindowMaker/Styles/.cvsignore --- WindowMaker-0.91.0/WindowMaker/Styles/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Styles/.cvsignore 2003-04-02 15:37:09 +0400 @@ -0,0 +1,2 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WindowMaker/Styles/Makefile.in wm/WindowMaker/Styles/Makefile.in --- WindowMaker-0.91.0/WindowMaker/Styles/Makefile.in 2004-10-26 08:10:47 +0400 +++ wm/WindowMaker/Styles/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,244 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -prefsdatadir = $(pkgdatadir)/Styles - -prefsdata_DATA = Autumn.style Black.style BlackTexture.style Blue.style BlueDawn.style BlueishGreen.style Brown.style Brownish.style Chumbo.style Copper.style DarkBlue.style DarkRed.style Emerald.style Fire.style Food.style Golden.style Green.style GreyBlue.style Gtk.style Interlace.style IRednBlue.style LightBlue.style NewBlue.style NightSky.style Pastel.style Pink.style Pumpkin.style Purple.style Purplish.style Red.style RednBlue.style Spring.style Summer.style Traditional.style VioletBlue.style - - -EXTRA_DIST = $(prefsdata_DATA) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -DATA = $(prefsdata_DATA) - -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Styles/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-prefsdataDATA: $(prefsdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(prefsdatadir) - @list='$(prefsdata_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(prefsdatadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(prefsdatadir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(prefsdatadir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(prefsdatadir)/$$p; \ - fi; fi; \ - done - -uninstall-prefsdataDATA: - @$(NORMAL_UNINSTALL) - list='$(prefsdata_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(prefsdatadir)/$$p; \ - done -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WindowMaker/Styles - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-prefsdataDATA -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-prefsdataDATA -uninstall: uninstall-am -all-am: Makefile $(DATA) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(prefsdatadir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: uninstall-prefsdataDATA install-prefsdataDATA tags distdir \ -info-am info dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/Checker.themed/CVS/Entries wm/WindowMaker/Themes/Checker.themed/CVS/Entries --- WindowMaker-0.91.0/WindowMaker/Themes/Checker.themed/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/Checker.themed/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +D diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/Checker.themed/CVS/Repository wm/WindowMaker/Themes/Checker.themed/CVS/Repository --- WindowMaker-0.91.0/WindowMaker/Themes/Checker.themed/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/Checker.themed/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/WindowMaker/Themes/Checker.themed diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/Checker.themed/CVS/Root wm/WindowMaker/Themes/Checker.themed/CVS/Root --- WindowMaker-0.91.0/WindowMaker/Themes/Checker.themed/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/Checker.themed/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/CVS/Entries wm/WindowMaker/Themes/CVS/Entries --- WindowMaker-0.91.0/WindowMaker/Themes/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1,7 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:09 2003// +/Default.style/1.2/Fri Oct 22 00:21:52 2004// +/Makefile.am/1.6/Sat Jul 17 21:11:55 1999// +/OpenStep.style/1.2/Fri Oct 22 00:21:52 2004// +/Pastel.style/1.5/Fri Oct 22 00:21:52 2004// +/SteelBlueSilk.style/1.2/Fri Oct 22 00:21:52 2004// +D diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/CVS/Entries.Log wm/WindowMaker/Themes/CVS/Entries.Log --- WindowMaker-0.91.0/WindowMaker/Themes/CVS/Entries.Log 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/CVS/Entries.Log 2005-05-17 22:43:25 +0400 @@ -0,0 +1,4 @@ +A D/Checker.themed//// +A D/LeetWM.themed//// +A D/Night.themed//// +A D/STEP2000.themed//// diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/CVS/Repository wm/WindowMaker/Themes/CVS/Repository --- WindowMaker-0.91.0/WindowMaker/Themes/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/WindowMaker/Themes diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/CVS/Root wm/WindowMaker/Themes/CVS/Root --- WindowMaker-0.91.0/WindowMaker/Themes/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/.cvsignore wm/WindowMaker/Themes/.cvsignore --- WindowMaker-0.91.0/WindowMaker/Themes/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/.cvsignore 2003-04-02 15:37:09 +0400 @@ -0,0 +1,2 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/LeetWM.themed/CVS/Entries wm/WindowMaker/Themes/LeetWM.themed/CVS/Entries --- WindowMaker-0.91.0/WindowMaker/Themes/LeetWM.themed/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/LeetWM.themed/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +D diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/LeetWM.themed/CVS/Repository wm/WindowMaker/Themes/LeetWM.themed/CVS/Repository --- WindowMaker-0.91.0/WindowMaker/Themes/LeetWM.themed/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/LeetWM.themed/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/WindowMaker/Themes/LeetWM.themed diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/LeetWM.themed/CVS/Root wm/WindowMaker/Themes/LeetWM.themed/CVS/Root --- WindowMaker-0.91.0/WindowMaker/Themes/LeetWM.themed/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/LeetWM.themed/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/Makefile.in wm/WindowMaker/Themes/Makefile.in --- WindowMaker-0.91.0/WindowMaker/Themes/Makefile.in 2004-10-26 08:10:47 +0400 +++ wm/WindowMaker/Themes/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,243 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -defsdatadir = $(pkgdatadir)/Themes - -defsdata_DATA = Default.style OpenStep.style Pastel.style SteelBlueSilk.style - -EXTRA_DIST = $(defsdata_DATA) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -DATA = $(defsdata_DATA) - -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WindowMaker/Themes/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-defsdataDATA: $(defsdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(defsdatadir) - @list='$(defsdata_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defsdatadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defsdatadir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(defsdatadir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(defsdatadir)/$$p; \ - fi; fi; \ - done - -uninstall-defsdataDATA: - @$(NORMAL_UNINSTALL) - list='$(defsdata_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(defsdatadir)/$$p; \ - done -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WindowMaker/Themes - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-defsdataDATA -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-defsdataDATA -uninstall: uninstall-am -all-am: Makefile $(DATA) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(defsdatadir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: uninstall-defsdataDATA install-defsdataDATA tags distdir info-am \ -info dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/Night.themed/CVS/Entries wm/WindowMaker/Themes/Night.themed/CVS/Entries --- WindowMaker-0.91.0/WindowMaker/Themes/Night.themed/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/Night.themed/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +D diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/Night.themed/CVS/Repository wm/WindowMaker/Themes/Night.themed/CVS/Repository --- WindowMaker-0.91.0/WindowMaker/Themes/Night.themed/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/Night.themed/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/WindowMaker/Themes/Night.themed diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/Night.themed/CVS/Root wm/WindowMaker/Themes/Night.themed/CVS/Root --- WindowMaker-0.91.0/WindowMaker/Themes/Night.themed/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/Night.themed/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/STEP2000.themed/CVS/Entries wm/WindowMaker/Themes/STEP2000.themed/CVS/Entries --- WindowMaker-0.91.0/WindowMaker/Themes/STEP2000.themed/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/STEP2000.themed/CVS/Entries 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +D diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/STEP2000.themed/CVS/Repository wm/WindowMaker/Themes/STEP2000.themed/CVS/Repository --- WindowMaker-0.91.0/WindowMaker/Themes/STEP2000.themed/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/STEP2000.themed/CVS/Repository 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +wm/WindowMaker/Themes/STEP2000.themed diff -Naur WindowMaker-0.91.0/WindowMaker/Themes/STEP2000.themed/CVS/Root wm/WindowMaker/Themes/STEP2000.themed/CVS/Root --- WindowMaker-0.91.0/WindowMaker/Themes/STEP2000.themed/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WindowMaker/Themes/STEP2000.themed/CVS/Root 2005-05-17 22:43:25 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WINGs/configuration.c wm/WINGs/configuration.c --- WindowMaker-0.91.0/WINGs/configuration.c 2004-10-22 12:31:21 +0400 +++ wm/WINGs/configuration.c 2004-10-28 08:17:18 +0400 @@ -53,7 +53,6 @@ if (defaults) { char *buttonName; unsigned button; - char *str; WINGsConfiguration.systemFont = WMGetUDStringForKey(defaults, "SystemFont"); diff -Naur WindowMaker-0.91.0/WINGs/CVS/Entries wm/WINGs/CVS/Entries --- WindowMaker-0.91.0/WINGs/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WINGs/CVS/Entries 2005-05-17 22:43:11 +0400 @@ -0,0 +1,70 @@ +/.cvsignore/1.9/Fri Apr 18 01:16:50 2003// +/BUGS/1.1/Fri Jun 4 20:22:31 1999// +/ChangeLog/1.156/Sat Oct 23 02:26:13 2004// +/Makefile.am/1.71/Tue Oct 12 02:13:15 2004// +/NEWS/1.11/Sat Oct 23 02:26:13 2004// +/README/1.10/Mon Nov 25 04:46:00 2002// +/TODO/1.12/Sun Mar 24 21:57:21 2002// +/array.c/1.15/Wed Apr 2 11:37:05 2003// +/bagtree.c/1.13/Tue Oct 31 14:57:22 2000// +/configuration.c/1.24/Thu Oct 28 04:17:18 2004// +/connection.c/1.30/Sat Oct 23 03:30:03 2004// +/data.c/1.14/Tue Oct 12 21:28:27 2004// +/dragcommon.c/1.6/Sat Oct 30 05:46:37 2004// +/dragdestination.c/1.14/Sat Oct 30 05:46:37 2004// +/dragsource.c/1.16/Sat Oct 30 05:46:37 2004// +/error.c/1.15/Tue Oct 26 03:03:02 2004// +/findfile.c/1.14/Tue Oct 12 21:28:27 2004// +/handlers.c/1.9/Sat Oct 30 05:46:37 2004// +/hashtable.c/1.13/Tue Oct 12 21:28:27 2004// +/host.c/1.17/Thu Jan 16 23:30:46 2003// +/international.c/1.2/Tue Oct 12 21:28:27 2004// +/memory.c/1.16/Fri Mar 11 01:56:07 2005// +/misc.c/1.1/Thu Apr 19 21:12:08 2001// +/notification.c/1.12/Tue Oct 12 21:28:27 2004// +/proplist.c/1.18/Tue Oct 12 21:28:27 2004// +/selection.c/1.19/Tue Oct 12 21:28:27 2004// +/snprintf.c/1.3/Tue Oct 12 21:28:27 2004// +/string.c/1.9/Tue Oct 12 21:28:27 2004// +/tree.c/1.3/Thu Jan 18 16:59:15 2001// +/userdefaults.c/1.24/Tue Oct 12 21:28:27 2004// +/usleep.c/1.5/Sat Oct 30 05:46:37 2004// +/wapplication.c/1.13/Sun Oct 24 03:20:29 2004// +/wappresource.c/1.8/Tue Oct 12 21:28:27 2004// +/wballoon.c/1.13/Sat Oct 30 05:46:37 2004// +/wbox.c/1.13/Tue Oct 12 21:28:27 2004// +/wbrowser.c/1.35/Tue Oct 12 21:28:27 2004// +/wbutton.c/1.21/Tue Oct 12 21:28:27 2004// +/wcolor.c/1.9/Mon Oct 25 00:07:51 2004// +/wcolorpanel.c/1.37/Tue Oct 12 21:28:27 2004// +/wcolorwell.c/1.19/Wed Apr 7 02:50:52 2004// +/wconfig.h/1.3/Mon Sep 17 01:55:23 2001// +/wevent.c/1.43/Thu Oct 28 04:17:18 2004// +/wfilepanel.c/1.38/Tue Oct 12 21:28:27 2004// +/wfont.c/1.53/Sat Oct 30 06:39:27 2004// +/wfont_noxft.c/1.4/Tue Oct 12 21:28:27 2004// +/wfont_wchar.c/1.1/Tue Oct 12 01:34:32 2004// +/wfontpanel.c/1.26/Sat Oct 23 03:30:03 2004// +/wframe.c/1.17/Tue Oct 12 21:28:27 2004// +/widgets.c/1.61/Thu Oct 28 04:17:18 2004// +/winputmethod.c/1.7/Thu Oct 28 04:17:18 2004// +/wlabel.c/1.12/Tue Oct 12 21:28:27 2004// +/wlist.c/1.38/Wed Nov 13 15:13:48 2002// +/wmenuitem.c/1.5/Wed Oct 13 23:39:29 2004// +/wmisc.c/1.20/Sat Nov 6 20:20:05 2004// +/wpanel.c/1.25/Tue Oct 12 21:28:27 2004// +/wpixmap.c/1.8/Tue Oct 12 21:28:27 2004// +/wpopupbutton.c/1.27/Tue Oct 12 21:28:27 2004// +/wprogressindicator.c/1.7/Tue Oct 12 21:28:27 2004// +/wruler.c/1.16/Tue Oct 12 21:28:27 2004// +/wscroller.c/1.21/Thu Oct 28 04:17:18 2004// +/wscrollview.c/1.20/Tue Oct 12 21:28:27 2004// +/wslider.c/1.13/Tue Oct 12 21:28:27 2004// +/wsplitview.c/1.11/Tue Oct 12 21:28:27 2004// +/wtabview.c/1.27/Tue Oct 12 21:28:27 2004// +/wtext.c/1.74/Thu Oct 28 04:17:18 2004// +/wtextfield.c/1.66/Thu Oct 28 04:17:19 2004// +/wutil.c/1.12/Mon Sep 9 04:25:52 2002// +/wview.c/1.31/Thu Oct 28 04:17:19 2004// +/wwindow.c/1.29/Sun Oct 24 03:20:29 2004// +D diff -Naur WindowMaker-0.91.0/WINGs/CVS/Entries.Log wm/WINGs/CVS/Entries.Log --- WindowMaker-0.91.0/WINGs/CVS/Entries.Log 1970-01-01 03:00:00 +0300 +++ wm/WINGs/CVS/Entries.Log 2005-05-17 22:43:12 +0400 @@ -0,0 +1,8 @@ +A D/Documentation//// +A D/Examples//// +A D/Extras//// +A D/Resources//// +A D/Tests//// +A D/WINGs//// +A D/po//// +A D/python//// diff -Naur WindowMaker-0.91.0/WINGs/CVS/Repository wm/WINGs/CVS/Repository --- WindowMaker-0.91.0/WINGs/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WINGs/CVS/Repository 2005-05-17 22:43:10 +0400 @@ -0,0 +1 @@ +wm/WINGs diff -Naur WindowMaker-0.91.0/WINGs/CVS/Root wm/WINGs/CVS/Root --- WindowMaker-0.91.0/WINGs/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WINGs/CVS/Root 2005-05-17 22:43:10 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WINGs/.cvsignore wm/WINGs/.cvsignore --- WindowMaker-0.91.0/WINGs/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WINGs/.cvsignore 2003-04-18 05:16:50 +0400 @@ -0,0 +1,4 @@ +Makefile Makefile.in +get-wings-flags get-wutil-flags +.libs *.pc +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WINGs/Documentation/CVS/Entries wm/WINGs/Documentation/CVS/Entries --- WindowMaker-0.91.0/WINGs/Documentation/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Documentation/CVS/Entries 2005-05-17 22:43:11 +0400 @@ -0,0 +1,4 @@ +/.cvsignore/1.2/Wed Apr 2 11:37:05 2003// +/Makefile.am/1.3/Sat Dec 30 17:13:48 2000// +/README.connection/1.2/Fri Feb 9 03:20:54 2001// +D diff -Naur WindowMaker-0.91.0/WINGs/Documentation/CVS/Repository wm/WINGs/Documentation/CVS/Repository --- WindowMaker-0.91.0/WINGs/Documentation/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Documentation/CVS/Repository 2005-05-17 22:43:11 +0400 @@ -0,0 +1 @@ +wm/WINGs/Documentation diff -Naur WindowMaker-0.91.0/WINGs/Documentation/CVS/Root wm/WINGs/Documentation/CVS/Root --- WindowMaker-0.91.0/WINGs/Documentation/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Documentation/CVS/Root 2005-05-17 22:43:11 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WINGs/Documentation/.cvsignore wm/WINGs/Documentation/.cvsignore --- WindowMaker-0.91.0/WINGs/Documentation/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Documentation/.cvsignore 2003-04-02 15:37:05 +0400 @@ -0,0 +1,2 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WINGs/Documentation/Makefile.in wm/WINGs/Documentation/Makefile.in --- WindowMaker-0.91.0/WINGs/Documentation/Makefile.in 2004-10-26 08:10:45 +0400 +++ wm/WINGs/Documentation/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,219 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -AUTOMAKE_OPTIONS = no-dependencies - -EXTRA_DIST = README.connection -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Documentation/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WINGs/Documentation - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WINGs/dragcommon.c wm/WINGs/dragcommon.c --- WindowMaker-0.91.0/WINGs/dragcommon.c 2004-10-12 22:29:18 +0400 +++ wm/WINGs/dragcommon.c 2004-10-30 09:46:37 +0400 @@ -1,4 +1,5 @@ -/* #include */ + + #include "WINGsP.h" #define VERSION_INFO(dragInfo) dragInfo->protocolVersion diff -Naur WindowMaker-0.91.0/WINGs/dragdestination.c wm/WINGs/dragdestination.c --- WindowMaker-0.91.0/WINGs/dragdestination.c 2004-10-12 22:29:31 +0400 +++ wm/WINGs/dragdestination.c 2004-10-30 09:46:37 +0400 @@ -1,5 +1,7 @@ -#include + + #include "WINGsP.h" +#include #define XDND_SOURCE_RESPONSE_MAX_DELAY 3000 diff -Naur WindowMaker-0.91.0/WINGs/dragsource.c wm/WINGs/dragsource.c --- WindowMaker-0.91.0/WINGs/dragsource.c 2004-10-23 06:46:09 +0400 +++ wm/WINGs/dragsource.c 2004-10-30 09:46:37 +0400 @@ -1,4 +1,7 @@ -#include "../src/config.h" + + +#include "wconfig.h" +#include "WINGsP.h" #include #include @@ -6,7 +9,6 @@ #include #endif -#include "WINGsP.h" #define XDND_DESTINATION_RESPONSE_MAX_DELAY 10000 diff -Naur WindowMaker-0.91.0/WINGs/Examples/CVS/Entries wm/WINGs/Examples/CVS/Entries --- WindowMaker-0.91.0/WINGs/Examples/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Examples/CVS/Entries 2005-05-17 22:43:12 +0400 @@ -0,0 +1,9 @@ +/.cvsignore/1.5/Mon Oct 25 22:15:57 2004// +/Makefile.am/1.7/Tue Aug 24 19:27:45 2004// +/README/1.1/Fri Feb 9 03:12:16 2001// +/colorpick.c/1.2/Tue Oct 12 21:28:27 2004// +/connect.c/1.9/Tue Oct 12 21:28:27 2004// +/fontl.c/1.5/Tue Oct 12 21:28:27 2004// +/puzzle.c/1.4/Tue Oct 12 21:28:27 2004// +/server.c/1.8/Thu Jan 16 23:30:47 2003// +D diff -Naur WindowMaker-0.91.0/WINGs/Examples/CVS/Repository wm/WINGs/Examples/CVS/Repository --- WindowMaker-0.91.0/WINGs/Examples/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Examples/CVS/Repository 2005-05-17 22:43:11 +0400 @@ -0,0 +1 @@ +wm/WINGs/Examples diff -Naur WindowMaker-0.91.0/WINGs/Examples/CVS/Root wm/WINGs/Examples/CVS/Root --- WindowMaker-0.91.0/WINGs/Examples/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Examples/CVS/Root 2005-05-17 22:43:11 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WINGs/Examples/.cvsignore wm/WINGs/Examples/.cvsignore --- WindowMaker-0.91.0/WINGs/Examples/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Examples/.cvsignore 2004-10-26 02:15:57 +0400 @@ -0,0 +1,5 @@ +Makefile Makefile.in +connect server fontl puzzle UserTime.plist +colorpick +.libs +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WINGs/Examples/Makefile.in wm/WINGs/Examples/Makefile.in --- WindowMaker-0.91.0/WINGs/Examples/Makefile.in 2004-10-26 08:10:45 +0400 +++ wm/WINGs/Examples/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,392 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -AUTOMAKE_OPTIONS = no-dependencies - -noinst_PROGRAMS = connect server fontl puzzle colorpick - -LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la @XFTLIBS@ @INTLIBS@ - - -colorpick_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a - -fontl_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a - -puzzle_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a - -connect_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a - -connect_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ @INTLIBS@ - - -server_DEPENDENCIES = $(top_builddir)/WINGs/libWUtil.a - -server_LDADD = $(top_builddir)/WINGs/libWUtil.a @LIBRARY_SEARCH_PATH@ @NETLIBS@ @INTLIBS@ - - -INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG - -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -noinst_PROGRAMS = connect$(EXEEXT) server$(EXEEXT) fontl$(EXEEXT) \ -puzzle$(EXEEXT) colorpick$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I../../src -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -connect_SOURCES = connect.c -connect_OBJECTS = connect.$(OBJEXT) -connect_LDFLAGS = -server_SOURCES = server.c -server_OBJECTS = server.$(OBJEXT) -server_LDFLAGS = -fontl_SOURCES = fontl.c -fontl_OBJECTS = fontl.$(OBJEXT) -fontl_LDADD = $(LDADD) -fontl_LDFLAGS = -puzzle_SOURCES = puzzle.c -puzzle_OBJECTS = puzzle.$(OBJEXT) -puzzle_LDADD = $(LDADD) -puzzle_LDFLAGS = -colorpick_SOURCES = colorpick.c -colorpick_OBJECTS = colorpick.$(OBJEXT) -colorpick_LDADD = $(LDADD) -colorpick_LDFLAGS = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = connect.c server.c fontl.c puzzle.c colorpick.c -OBJECTS = connect.$(OBJEXT) server.$(OBJEXT) fontl.$(OBJEXT) puzzle.$(OBJEXT) colorpick.$(OBJEXT) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Examples/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-noinstPROGRAMS: - -clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) - -distclean-noinstPROGRAMS: - -maintainer-clean-noinstPROGRAMS: - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -connect$(EXEEXT): $(connect_OBJECTS) $(connect_DEPENDENCIES) - @rm -f connect$(EXEEXT) - $(LINK) $(connect_LDFLAGS) $(connect_OBJECTS) $(connect_LDADD) $(LIBS) - -server$(EXEEXT): $(server_OBJECTS) $(server_DEPENDENCIES) - @rm -f server$(EXEEXT) - $(LINK) $(server_LDFLAGS) $(server_OBJECTS) $(server_LDADD) $(LIBS) - -fontl$(EXEEXT): $(fontl_OBJECTS) $(fontl_DEPENDENCIES) - @rm -f fontl$(EXEEXT) - $(LINK) $(fontl_LDFLAGS) $(fontl_OBJECTS) $(fontl_LDADD) $(LIBS) - -puzzle$(EXEEXT): $(puzzle_OBJECTS) $(puzzle_DEPENDENCIES) - @rm -f puzzle$(EXEEXT) - $(LINK) $(puzzle_LDFLAGS) $(puzzle_OBJECTS) $(puzzle_LDADD) $(LIBS) - -colorpick$(EXEEXT): $(colorpick_OBJECTS) $(colorpick_DEPENDENCIES) - @rm -f colorpick$(EXEEXT) - $(LINK) $(colorpick_LDFLAGS) $(colorpick_OBJECTS) $(colorpick_LDADD) $(LIBS) - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WINGs/Examples - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ - mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-noinstPROGRAMS distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ -clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WINGs/Extras/CVS/Entries wm/WINGs/Extras/CVS/Entries --- WindowMaker-0.91.0/WINGs/Extras/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Extras/CVS/Entries 2005-05-17 22:43:12 +0400 @@ -0,0 +1,8 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:05 2003// +/Makefile.am/1.11/Tue Oct 12 02:13:15 2004// +/test.c/1.15/Tue Oct 12 21:28:27 2004// +/wtabledelegates.c/1.7/Tue Oct 12 21:28:27 2004// +/wtabledelegates.h/1.2/Tue Oct 12 21:28:27 2004// +/wtableview.c/1.27/Tue Oct 12 21:28:27 2004// +/wtableview.h/1.10/Tue Oct 12 21:28:27 2004// +D diff -Naur WindowMaker-0.91.0/WINGs/Extras/CVS/Repository wm/WINGs/Extras/CVS/Repository --- WindowMaker-0.91.0/WINGs/Extras/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Extras/CVS/Repository 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +wm/WINGs/Extras diff -Naur WindowMaker-0.91.0/WINGs/Extras/CVS/Root wm/WINGs/Extras/CVS/Root --- WindowMaker-0.91.0/WINGs/Extras/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Extras/CVS/Root 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WINGs/Extras/.cvsignore wm/WINGs/Extras/.cvsignore --- WindowMaker-0.91.0/WINGs/Extras/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Extras/.cvsignore 2003-04-02 15:37:05 +0400 @@ -0,0 +1,4 @@ +Makefile Makefile.in +.libs +test +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WINGs/Extras/Makefile.in wm/WINGs/Extras/Makefile.in --- WindowMaker-0.91.0/WINGs/Extras/Makefile.in 2004-10-26 08:10:46 +0400 +++ wm/WINGs/Extras/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,425 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -AUTOMAKE_OPTIONS = no-dependencies - -# is this a kluge? if so, how should i do it? -includedir = @includedir@/WINGs - -include_HEADERS = wtableview.h wtabledelegates.h - -lib_LIBRARIES = libExtraWINGs.a - -noinst_PROGRAMS = test - -EXTRA_DIST = - -libExtraWINGs_a_SOURCES = wtableview.c wtabledelegates.c wtableview.h wtabledelegates.h - - -AM_CFLAGS = @NOSTRICTALIASING@ - -INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs -DRESOURCE_PATH=\"$(datadir)/WINGs\" @HEADER_SEARCH_PATH@ -DDEBUG - - -LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la @XFTLIBS@ @INTLIBS@ - - -test_LDADD = wtableview.o wtabledelegates.o $(LDADD) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(lib_LIBRARIES) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I../../src -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -libExtraWINGs_a_LIBADD = -libExtraWINGs_a_OBJECTS = wtableview.$(OBJEXT) \ -wtabledelegates.$(OBJEXT) -noinst_PROGRAMS = test$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) - -test_SOURCES = test.c -test_OBJECTS = test.$(OBJEXT) -test_DEPENDENCIES = wtableview.o wtabledelegates.o \ -$(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la -test_LDFLAGS = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -HEADERS = $(include_HEADERS) - -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = $(libExtraWINGs_a_SOURCES) test.c -OBJECTS = $(libExtraWINGs_a_OBJECTS) test.$(OBJEXT) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Extras/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-libLIBRARIES: - -clean-libLIBRARIES: - -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) - -distclean-libLIBRARIES: - -maintainer-clean-libLIBRARIES: - -install-libLIBRARIES: $(lib_LIBRARIES) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ - else :; fi; \ - done - @$(POST_INSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ - $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ - else :; fi; \ - done - -uninstall-libLIBRARIES: - @$(NORMAL_UNINSTALL) - list='$(lib_LIBRARIES)'; for p in $$list; do \ - rm -f $(DESTDIR)$(libdir)/$$p; \ - done - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -libExtraWINGs.a: $(libExtraWINGs_a_OBJECTS) $(libExtraWINGs_a_DEPENDENCIES) - -rm -f libExtraWINGs.a - $(AR) cru libExtraWINGs.a $(libExtraWINGs_a_OBJECTS) $(libExtraWINGs_a_LIBADD) - $(RANLIB) libExtraWINGs.a - -mostlyclean-noinstPROGRAMS: - -clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) - -distclean-noinstPROGRAMS: - -maintainer-clean-noinstPROGRAMS: - -test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) - @rm -f test$(EXEEXT) - $(LINK) $(test_LDFLAGS) $(test_OBJECTS) $(test_LDADD) $(LIBS) - -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir) - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \ - done - -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/$$p; \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WINGs/Extras - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: install-libLIBRARIES -install-exec: install-exec-am - -install-data-am: install-includeHEADERS -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-libLIBRARIES uninstall-includeHEADERS -uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) $(PROGRAMS) $(HEADERS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-libLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-noinstPROGRAMS \ - mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-libLIBRARIES clean-compile clean-libtool \ - clean-noinstPROGRAMS clean-tags clean-generic \ - mostlyclean-am - -clean: clean-am - -distclean-am: distclean-libLIBRARIES distclean-compile \ - distclean-libtool distclean-noinstPROGRAMS \ - distclean-tags distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-libLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ - maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-libLIBRARIES distclean-libLIBRARIES \ -clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \ -install-libLIBRARIES mostlyclean-compile distclean-compile \ -clean-compile maintainer-clean-compile mostlyclean-libtool \ -distclean-libtool clean-libtool maintainer-clean-libtool \ -mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ -clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ -uninstall-includeHEADERS install-includeHEADERS tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WINGs/handlers.c wm/WINGs/handlers.c --- WindowMaker-0.91.0/WINGs/handlers.c 2004-10-12 22:30:29 +0400 +++ wm/WINGs/handlers.c 2004-10-30 09:46:37 +0400 @@ -3,10 +3,9 @@ * WINGs internal handlers: timer, idle and input handlers */ +#include "wconfig.h" #include "WINGsP.h" -#include "../src/config.h" - #include #include diff -Naur WindowMaker-0.91.0/WINGs/Makefile.in wm/WINGs/Makefile.in --- WindowMaker-0.91.0/WINGs/Makefile.in 2004-10-26 08:10:45 +0400 +++ wm/WINGs/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,534 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -AUTOMAKE_OPTIONS = no-dependencies - -SUBDIRS = WINGs . po Documentation Resources Examples Extras Tests - -#libWINGs_la_LDFLAGS = -version-info 1:1:0 - -bin_SCRIPTS = get-wings-flags get-wutil-flags - -lib_LIBRARIES = libWINGs.a libWUtil.a - -LDADD = libWINGs.a $(top_builddir)/wrlib/libwraster.la @INTLIBS@ - -EXTRA_DIST = BUGS python/Makefile python/README python/WINGs.i python/WINGs.py python/setup.py python/test.py - - -# wbutton.c -libWINGs_a_SOURCES = array.c bagtree.c configuration.c connection.c data.c dragcommon.c dragdestination.c dragsource.c error.c findfile.c handlers.c hashtable.c host.c international.c memory.c misc.c notification.c proplist.c selection.c snprintf.c string.c tree.c userdefaults.c usleep.c wapplication.c wappresource.c wballoon.c wbox.c wbrowser.c wbutton.c wcolor.c wcolorpanel.c wcolorwell.c wconfig.h wevent.c wfilepanel.c wframe.c wfont.c wfontpanel.c widgets.c winputmethod.c wlabel.c wlist.c wmenuitem.c wmisc.c wpanel.c wpixmap.c wpopupbutton.c wprogressindicator.c wruler.c wscroller.c wscrollview.c wslider.c wsplitview.c wtabview.c wtext.c wtextfield.c wview.c wwindow.c - - -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_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 - - -DISTCLEANFILES = WINGs.pc -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../src/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(lib_LIBRARIES) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I../src -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -libWINGs_a_LIBADD = -libWINGs_a_OBJECTS = array.$(OBJEXT) bagtree.$(OBJEXT) \ -configuration.$(OBJEXT) connection.$(OBJEXT) data.$(OBJEXT) \ -dragcommon.$(OBJEXT) dragdestination.$(OBJEXT) dragsource.$(OBJEXT) \ -error.$(OBJEXT) findfile.$(OBJEXT) handlers.$(OBJEXT) \ -hashtable.$(OBJEXT) host.$(OBJEXT) international.$(OBJEXT) \ -memory.$(OBJEXT) misc.$(OBJEXT) notification.$(OBJEXT) \ -proplist.$(OBJEXT) selection.$(OBJEXT) snprintf.$(OBJEXT) \ -string.$(OBJEXT) tree.$(OBJEXT) userdefaults.$(OBJEXT) usleep.$(OBJEXT) \ -wapplication.$(OBJEXT) wappresource.$(OBJEXT) wballoon.$(OBJEXT) \ -wbox.$(OBJEXT) wbrowser.$(OBJEXT) wbutton.$(OBJEXT) wcolor.$(OBJEXT) \ -wcolorpanel.$(OBJEXT) wcolorwell.$(OBJEXT) wevent.$(OBJEXT) \ -wfilepanel.$(OBJEXT) wframe.$(OBJEXT) wfont.$(OBJEXT) \ -wfontpanel.$(OBJEXT) widgets.$(OBJEXT) winputmethod.$(OBJEXT) \ -wlabel.$(OBJEXT) wlist.$(OBJEXT) wmenuitem.$(OBJEXT) wmisc.$(OBJEXT) \ -wpanel.$(OBJEXT) wpixmap.$(OBJEXT) wpopupbutton.$(OBJEXT) \ -wprogressindicator.$(OBJEXT) wruler.$(OBJEXT) wscroller.$(OBJEXT) \ -wscrollview.$(OBJEXT) wslider.$(OBJEXT) wsplitview.$(OBJEXT) \ -wtabview.$(OBJEXT) wtext.$(OBJEXT) wtextfield.$(OBJEXT) wview.$(OBJEXT) \ -wwindow.$(OBJEXT) -libWUtil_a_LIBADD = -libWUtil_a_OBJECTS = array.$(OBJEXT) bagtree.$(OBJEXT) \ -connection.$(OBJEXT) data.$(OBJEXT) error.$(OBJEXT) findfile.$(OBJEXT) \ -handlers.$(OBJEXT) hashtable.$(OBJEXT) host.$(OBJEXT) \ -international.$(OBJEXT) memory.$(OBJEXT) misc.$(OBJEXT) \ -notification.$(OBJEXT) proplist.$(OBJEXT) snprintf.$(OBJEXT) \ -string.$(OBJEXT) tree.$(OBJEXT) userdefaults.$(OBJEXT) usleep.$(OBJEXT) \ -wapplication.$(OBJEXT) wutil.$(OBJEXT) -SCRIPTS = $(bin_SCRIPTS) - -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README ChangeLog Makefile.am Makefile.in NEWS TODO - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = $(libWINGs_a_SOURCES) $(libWUtil_a_SOURCES) -OBJECTS = $(libWINGs_a_OBJECTS) $(libWUtil_a_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-libLIBRARIES: - -clean-libLIBRARIES: - -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) - -distclean-libLIBRARIES: - -maintainer-clean-libLIBRARIES: - -install-libLIBRARIES: $(lib_LIBRARIES) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ - else :; fi; \ - done - @$(POST_INSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ - $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ - else :; fi; \ - done - -uninstall-libLIBRARIES: - @$(NORMAL_UNINSTALL) - list='$(lib_LIBRARIES)'; for p in $$list; do \ - rm -f $(DESTDIR)$(libdir)/$$p; \ - done - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -libWINGs.a: $(libWINGs_a_OBJECTS) $(libWINGs_a_DEPENDENCIES) - -rm -f libWINGs.a - $(AR) cru libWINGs.a $(libWINGs_a_OBJECTS) $(libWINGs_a_LIBADD) - $(RANLIB) libWINGs.a - -libWUtil.a: $(libWUtil_a_OBJECTS) $(libWUtil_a_DEPENDENCIES) - -rm -f libWUtil.a - $(AR) cru libWUtil.a $(libWUtil_a_OBJECTS) $(libWUtil_a_LIBADD) - $(RANLIB) libWUtil.a - -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - list='$(bin_SCRIPTS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - done - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WINGs - -distdir: $(DISTFILES) - $(mkinstalldirs) $(distdir)/python - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive -check-am: all-am -check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -install-exec-am: install-libLIBRARIES install-binSCRIPTS \ - install-exec-local -install-exec: install-exec-recursive - -install-data-am: -install-data: install-data-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: uninstall-libLIBRARIES uninstall-binSCRIPTS -uninstall: uninstall-recursive -all-am: Makefile $(LIBRARIES) $(SCRIPTS) -all-redirect: all-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-libLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ - mostlyclean-generic - -mostlyclean: mostlyclean-recursive - -clean-am: clean-libLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am - -clean: clean-recursive - -distclean-am: distclean-libLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am - -rm -f libtool - -distclean: distclean-recursive - -maintainer-clean-am: maintainer-clean-libLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-recursive - -.PHONY: mostlyclean-libLIBRARIES distclean-libLIBRARIES \ -clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \ -install-libLIBRARIES mostlyclean-compile distclean-compile \ -clean-compile maintainer-clean-compile mostlyclean-libtool \ -distclean-libtool clean-libtool maintainer-clean-libtool \ -uninstall-binSCRIPTS install-binSCRIPTS install-data-recursive \ -uninstall-data-recursive install-exec-recursive \ -uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ -all-recursive check-recursive installcheck-recursive info-recursive \ -dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-local install-exec-am install-exec install-data-am \ -install-data install-am install uninstall-am uninstall all-redirect \ -all-am all installdirs-am installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean - - -wcolorpanel.o: wcolorpanel.c - $(COMPILE) -c -DRGBTXT="\"@X_LIBRARY_PATH@/X11/rgb.txt\"" $< - -install-exec-local: - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig - @list='WINGs.pc'; for p in $$list; do \ - if test -f $$p; then \ - echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \ - else :; fi; \ - done - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WINGs/memory.c wm/WINGs/memory.c --- WindowMaker-0.91.0/WINGs/memory.c 2004-10-13 00:41:49 +0400 +++ wm/WINGs/memory.c 2005-03-11 04:56:07 +0300 @@ -19,8 +19,7 @@ */ -#include "../src/config.h" - +#include "wconfig.h" #include "WUtil.h" #include @@ -112,6 +111,19 @@ void* +wmalloc0(size_t size) +{ + void *ptr= wmalloc(size); + if (!ptr) + return NULL; + + memset(ptr, 0, size); + + return ptr; +} + + +void* wrealloc(void *ptr, size_t newsize) { void *nptr; diff -Naur WindowMaker-0.91.0/WINGs/po/CVS/Entries wm/WINGs/po/CVS/Entries --- WindowMaker-0.91.0/WINGs/po/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WINGs/po/CVS/Entries 2005-05-17 22:43:12 +0400 @@ -0,0 +1,10 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:06 2003// +/Makefile.am/1.12/Tue Oct 26 20:03:06 2004// +/README/1.10/Sun Oct 17 04:32:25 2004// +/bg.po/1.3/Sun Oct 17 05:05:57 2004// +/ca.po/1.4/Sun Oct 17 05:05:57 2004// +/cs.po/1.3/Sun Oct 17 05:05:57 2004// +/de.po/1.7/Tue Oct 26 03:44:08 2004// +/fr.po/1.6/Tue Oct 26 03:40:44 2004// +/sk.po/1.6/Sun Oct 17 05:05:57 2004// +D diff -Naur WindowMaker-0.91.0/WINGs/po/CVS/Repository wm/WINGs/po/CVS/Repository --- WindowMaker-0.91.0/WINGs/po/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WINGs/po/CVS/Repository 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +wm/WINGs/po diff -Naur WindowMaker-0.91.0/WINGs/po/CVS/Root wm/WINGs/po/CVS/Root --- WindowMaker-0.91.0/WINGs/po/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WINGs/po/CVS/Root 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WINGs/po/.cvsignore wm/WINGs/po/.cvsignore --- WindowMaker-0.91.0/WINGs/po/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WINGs/po/.cvsignore 2003-04-02 15:37:06 +0400 @@ -0,0 +1,4 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt +*.pot +*.mo diff -Naur WindowMaker-0.91.0/WINGs/po/Makefile.am wm/WINGs/po/Makefile.am --- WindowMaker-0.91.0/WINGs/po/Makefile.am 2004-10-26 07:17:12 +0400 +++ wm/WINGs/po/Makefile.am 2004-10-27 00:03:06 +0400 @@ -31,7 +31,7 @@ WINGs.pot: $(POTFILES) xgettext --default-domain=WINGs \ - --add-comments --keyword=_ $(POTFILES) + --add-comments --keyword=_ --keyword=N_ $(POTFILES) if cmp -s WINGs.po WINGs.pot; then \ rm -f WINGs.po; \ else \ diff -Naur WindowMaker-0.91.0/WINGs/po/Makefile.in wm/WINGs/po/Makefile.in --- WindowMaker-0.91.0/WINGs/po/Makefile.in 2004-10-26 08:10:46 +0400 +++ wm/WINGs/po/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,262 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -nlsdir = $(NLSDIR) - -CATALOGS = @WINGSMOFILES@ - -CLEANFILES = $(CATALOGS) WINGs.pot - -EXTRA_DIST = bg.po ca.po cs.po de.po fr.po sk.po - -POTFILES = $(top_builddir)/WINGs/connection.c $(top_builddir)/WINGs/error.c $(top_builddir)/WINGs/findfile.c $(top_builddir)/WINGs/host.c $(top_builddir)/WINGs/proplist.c $(top_builddir)/WINGs/userdefaults.c $(top_builddir)/WINGs/wcolor.c $(top_builddir)/WINGs/wcolorpanel.c $(top_builddir)/WINGs/wfilepanel.c $(top_builddir)/WINGs/wfont.c $(top_builddir)/WINGs/wfontpanel.c $(top_builddir)/WINGs/widgets.c $(top_builddir)/WINGs/wruler.c - - -SUFFIXES = .po .mo -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -.SUFFIXES: .mo .po -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/po/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WINGs/po - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-data-local -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile all-local -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-local install-data-am install-data install-am install \ -uninstall-am uninstall all-local all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -.po.mo: - msgfmt -c -o $@ $< - -all-local: $(CATALOGS) - -WINGs.pot: $(POTFILES) - xgettext --default-domain=WINGs \ - --add-comments --keyword=_ $(POTFILES) - if cmp -s WINGs.po WINGs.pot; then \ - rm -f WINGs.po; \ - else \ - mv -f WINGs.po WINGs.pot; \ - fi - -install-data-local: $(CATALOGS) - $(mkinstalldirs) $(DESTDIR)$(nlsdir) - chmod 755 $(DESTDIR)$(nlsdir) - for n in $(CATALOGS) __DuMmY ; do \ - if test "$$n" -a "$$n" != "__DuMmY" ; then \ - l=`basename $$n .mo`; \ - $(mkinstalldirs) $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \ - chmod 755 $(DESTDIR)$(nlsdir)/$$l; \ - chmod 755 $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \ - $(INSTALL_DATA) -m 644 $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WINGs.mo; \ - fi; \ - done - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WINGs/python/CVS/Entries wm/WINGs/python/CVS/Entries --- WindowMaker-0.91.0/WINGs/python/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WINGs/python/CVS/Entries 2005-05-17 22:43:12 +0400 @@ -0,0 +1,8 @@ +/.cvsignore/1.2/Mon Dec 2 00:01:06 2002// +/Makefile/1.2/Fri Dec 20 17:47:32 2002// +/README/1.2/Thu Jan 15 20:36:48 2004// +/WINGs.i/1.2/Fri Dec 20 17:47:32 2002// +/WINGs.py/1.7/Tue Oct 12 01:34:32 2004// +/setup.py/1.3/Thu Jan 15 20:36:48 2004// +/test.py/1.3/Thu Feb 20 23:02:28 2003// +D diff -Naur WindowMaker-0.91.0/WINGs/python/CVS/Repository wm/WINGs/python/CVS/Repository --- WindowMaker-0.91.0/WINGs/python/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WINGs/python/CVS/Repository 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +wm/WINGs/python diff -Naur WindowMaker-0.91.0/WINGs/python/CVS/Root wm/WINGs/python/CVS/Root --- WindowMaker-0.91.0/WINGs/python/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WINGs/python/CVS/Root 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WINGs/python/.cvsignore wm/WINGs/python/.cvsignore --- WindowMaker-0.91.0/WINGs/python/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WINGs/python/.cvsignore 2002-12-02 03:01:06 +0300 @@ -0,0 +1,5 @@ +build +WINGs.c +wings.so +*.pyc +*.pyo diff -Naur WindowMaker-0.91.0/WINGs/Resources/CVS/Entries wm/WINGs/Resources/CVS/Entries --- WindowMaker-0.91.0/WINGs/Resources/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Resources/CVS/Entries 2005-05-17 22:43:12 +0400 @@ -0,0 +1,8 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:06 2003// +/Images.tiff/1.10/Wed Jun 9 20:22:44 1999// +/Images.xcf/1.10/Wed Jun 9 20:22:44 1999// +/Images.xpm/1.10/Wed Jun 9 20:22:44 1999// +/Makefile.am/1.1.1.1/Tue Sep 29 22:36:31 1998// +/defaultIcon.tiff/1.1.1.1/Tue Sep 29 22:36:31 1998// +/defaultIcon.xpm/1.1.1.1/Tue Sep 29 22:36:31 1998// +D diff -Naur WindowMaker-0.91.0/WINGs/Resources/CVS/Repository wm/WINGs/Resources/CVS/Repository --- WindowMaker-0.91.0/WINGs/Resources/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Resources/CVS/Repository 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +wm/WINGs/Resources diff -Naur WindowMaker-0.91.0/WINGs/Resources/CVS/Root wm/WINGs/Resources/CVS/Root --- WindowMaker-0.91.0/WINGs/Resources/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Resources/CVS/Root 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WINGs/Resources/.cvsignore wm/WINGs/Resources/.cvsignore --- WindowMaker-0.91.0/WINGs/Resources/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Resources/.cvsignore 2003-04-02 15:37:06 +0400 @@ -0,0 +1,2 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WINGs/Resources/Makefile.in wm/WINGs/Resources/Makefile.in --- WindowMaker-0.91.0/WINGs/Resources/Makefile.in 2004-10-26 08:10:46 +0400 +++ wm/WINGs/Resources/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,243 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -resdatadir = $(datadir)/WINGs - -resdata_DATA = Images.tiff Images.xpm defaultIcon.tiff defaultIcon.xpm - -EXTRA_DIST = $(resdata_DATA) Images.xcf -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -DATA = $(resdata_DATA) - -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Resources/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-resdataDATA: $(resdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(resdatadir) - @list='$(resdata_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(resdatadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(resdatadir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(resdatadir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(resdatadir)/$$p; \ - fi; fi; \ - done - -uninstall-resdataDATA: - @$(NORMAL_UNINSTALL) - list='$(resdata_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(resdatadir)/$$p; \ - done -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WINGs/Resources - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-resdataDATA -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-resdataDATA -uninstall: uninstall-am -all-am: Makefile $(DATA) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(resdatadir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: uninstall-resdataDATA install-resdataDATA tags distdir info-am \ -info dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-am install-exec install-data-am install-data install-am \ -install uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WINGs/Tests/CVS/Entries wm/WINGs/Tests/CVS/Entries --- WindowMaker-0.91.0/WINGs/Tests/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Tests/CVS/Entries 2005-05-17 22:43:12 +0400 @@ -0,0 +1,13 @@ +/.cvsignore/1.3/Wed Apr 2 11:37:06 2003// +/Makefile.am/1.10/Wed Apr 7 02:50:53 2004// +/logo.xpm/1.1/Wed Sep 13 20:19:05 2000// +/mywidget.c/1.4/Tue Oct 12 21:28:27 2004// +/mywidget.h/1.2/Tue Oct 12 21:28:27 2004// +/testmywidget.c/1.4/Tue Oct 12 21:28:27 2004// +/upbtn.xpm/1.1/Wed Sep 13 20:19:06 2000// +/wm.html/1.2/Fri Feb 9 17:01:51 2001// +/wm.png/1.1/Sat Dec 30 17:14:11 2000// +/wmfile.c/1.6/Tue Oct 12 21:28:27 2004// +/wmquery.c/1.5/Tue Oct 12 21:28:27 2004// +/wtest.c/1.47/Thu Oct 28 04:17:19 2004// +D diff -Naur WindowMaker-0.91.0/WINGs/Tests/CVS/Repository wm/WINGs/Tests/CVS/Repository --- WindowMaker-0.91.0/WINGs/Tests/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Tests/CVS/Repository 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +wm/WINGs/Tests diff -Naur WindowMaker-0.91.0/WINGs/Tests/CVS/Root wm/WINGs/Tests/CVS/Root --- WindowMaker-0.91.0/WINGs/Tests/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Tests/CVS/Root 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WINGs/Tests/.cvsignore wm/WINGs/Tests/.cvsignore --- WindowMaker-0.91.0/WINGs/Tests/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WINGs/Tests/.cvsignore 2003-04-02 15:37:06 +0400 @@ -0,0 +1,4 @@ +Makefile Makefile.in +testtext testcolorpanel testmywidget wmfile wmquery wtest +.libs +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WINGs/Tests/Makefile.in wm/WINGs/Tests/Makefile.in --- WindowMaker-0.91.0/WINGs/Tests/Makefile.in 2004-10-26 08:10:46 +0400 +++ wm/WINGs/Tests/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,381 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -AUTOMAKE_OPTIONS = no-dependencies - -noinst_PROGRAMS = wtest wmquery wmfile testmywidget - -LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la @XFTLIBS@ @INTLIBS@ - - -testmywidget_SOURCES = testmywidget.c mywidget.c mywidget.h - -wtest_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a - -EXTRA_DIST = logo.xpm upbtn.xpm wm.html wm.png - -INCLUDES = -I$(top_srcdir)/WINGs -I$(top_srcdir)/wrlib -I$(top_srcdir)/src -DRESOURCE_PATH=\"$(datadir)/WINGs\" @XFTFLAGS@ @HEADER_SEARCH_PATH@ -DDEBUG - -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -noinst_PROGRAMS = wtest$(EXEEXT) wmquery$(EXEEXT) wmfile$(EXEEXT) \ -testmywidget$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I../../src -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -wtest_SOURCES = wtest.c -wtest_OBJECTS = wtest.$(OBJEXT) -wtest_LDADD = $(LDADD) -wtest_LDFLAGS = -wmquery_SOURCES = wmquery.c -wmquery_OBJECTS = wmquery.$(OBJEXT) -wmquery_LDADD = $(LDADD) -wmquery_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a \ -$(top_builddir)/wrlib/libwraster.la -wmquery_LDFLAGS = -wmfile_SOURCES = wmfile.c -wmfile_OBJECTS = wmfile.$(OBJEXT) -wmfile_LDADD = $(LDADD) -wmfile_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a \ -$(top_builddir)/wrlib/libwraster.la -wmfile_LDFLAGS = -testmywidget_OBJECTS = testmywidget.$(OBJEXT) mywidget.$(OBJEXT) -testmywidget_LDADD = $(LDADD) -testmywidget_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a \ -$(top_builddir)/wrlib/libwraster.la -testmywidget_LDFLAGS = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = wtest.c wmquery.c wmfile.c $(testmywidget_SOURCES) -OBJECTS = wtest.$(OBJEXT) wmquery.$(OBJEXT) wmfile.$(OBJEXT) $(testmywidget_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/Tests/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-noinstPROGRAMS: - -clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) - -distclean-noinstPROGRAMS: - -maintainer-clean-noinstPROGRAMS: - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -wtest$(EXEEXT): $(wtest_OBJECTS) $(wtest_DEPENDENCIES) - @rm -f wtest$(EXEEXT) - $(LINK) $(wtest_LDFLAGS) $(wtest_OBJECTS) $(wtest_LDADD) $(LIBS) - -wmquery$(EXEEXT): $(wmquery_OBJECTS) $(wmquery_DEPENDENCIES) - @rm -f wmquery$(EXEEXT) - $(LINK) $(wmquery_LDFLAGS) $(wmquery_OBJECTS) $(wmquery_LDADD) $(LIBS) - -wmfile$(EXEEXT): $(wmfile_OBJECTS) $(wmfile_DEPENDENCIES) - @rm -f wmfile$(EXEEXT) - $(LINK) $(wmfile_LDFLAGS) $(wmfile_OBJECTS) $(wmfile_LDADD) $(LIBS) - -testmywidget$(EXEEXT): $(testmywidget_OBJECTS) $(testmywidget_DEPENDENCIES) - @rm -f testmywidget$(EXEEXT) - $(LINK) $(testmywidget_LDFLAGS) $(testmywidget_OBJECTS) $(testmywidget_LDADD) $(LIBS) - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WINGs/Tests - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile $(PROGRAMS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-noinstPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ - mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-noinstPROGRAMS clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-noinstPROGRAMS distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-noinstPROGRAMS \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-noinstPROGRAMS distclean-noinstPROGRAMS \ -clean-noinstPROGRAMS maintainer-clean-noinstPROGRAMS \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WINGs/Tests/wtest.c wm/WINGs/Tests/wtest.c --- WindowMaker-0.91.0/WINGs/Tests/wtest.c 2004-10-22 04:02:17 +0400 +++ wm/WINGs/Tests/wtest.c 2004-10-28 08:17:19 +0400 @@ -1047,6 +1047,8 @@ testColorPanel(scr); + testTextField(scr); + #if 0 testBox(scr); diff -Naur WindowMaker-0.91.0/WINGs/usleep.c wm/WINGs/usleep.c --- WindowMaker-0.91.0/WINGs/usleep.c 2004-10-12 22:32:36 +0400 +++ wm/WINGs/usleep.c 2004-10-30 09:46:37 +0400 @@ -1,6 +1,6 @@ -#include "../src/config.h" +#include "wconfig.h" #ifdef HAVE_SYS_TIME_H diff -Naur WindowMaker-0.91.0/WINGs/wballoon.c wm/WINGs/wballoon.c --- WindowMaker-0.91.0/WINGs/wballoon.c 2004-10-12 22:33:10 +0400 +++ wm/WINGs/wballoon.c 2004-10-30 09:46:37 +0400 @@ -1,7 +1,7 @@ -#include "../src/config.h" +#include "wconfig.h" #include "WINGsP.h" #ifdef SHAPE diff -Naur WindowMaker-0.91.0/WINGs/wevent.c wm/WINGs/wevent.c --- WindowMaker-0.91.0/WINGs/wevent.c 2004-10-12 22:34:43 +0400 +++ wm/WINGs/wevent.c 2004-10-28 08:17:18 +0400 @@ -213,6 +213,10 @@ return True; } + if (XFilterEvent(event, None) == True) { + return False; + } + mask = eventMasks[event->xany.type]; window = event->xany.window; diff -Naur WindowMaker-0.91.0/WINGs/wfont.c wm/WINGs/wfont.c --- WindowMaker-0.91.0/WINGs/wfont.c 2004-10-26 07:23:19 +0400 +++ wm/WINGs/wfont.c 2004-10-30 10:39:27 +0400 @@ -1,17 +1,17 @@ -#include "wconfig.h" - -#include -#include - #include +#include "wconfig.h" + #include "WINGsP.h" #include #include #include +#include +#include + #define DEFAULT_FONT "sans serif:pixelsize=12" diff -Naur WindowMaker-0.91.0/WINGs/wfont_noxft.c wm/WINGs/wfont_noxft.c --- WindowMaker-0.91.0/WINGs/wfont_noxft.c 1970-01-01 03:00:00 +0300 +++ wm/WINGs/wfont_noxft.c 2004-10-13 01:28:27 +0400 @@ -0,0 +1,769 @@ + + +#include "wconfig.h" + +#ifndef XFT + +#include "WINGsP.h" + +#include +#include +#include + + +static char *makeFontSetOfSize(char *fontset, int size); + + +/* XLFD pattern matching */ +static char* +getElementFromXLFD(const char *xlfd, int index) +{ + const char *p = xlfd; + while (*p != 0) { + if (*p == '-' && --index == 0) { + const char *end = strchr(p + 1, '-'); + char *buf; + size_t len; + if (end == 0) end = p + strlen(p); + len = end - (p + 1); + buf = wmalloc(len); + memcpy(buf, p + 1, len); + buf[len] = 0; + return buf; + } + p++; + } + return strdup("*"); +} + + +/* XLFD pattern matching */ +static char* +generalizeXLFD(const char *xlfd) +{ + char *buf; + int len; + char *weight = getElementFromXLFD(xlfd, 3); + char *slant = getElementFromXLFD(xlfd, 4); + char *pxlsz = getElementFromXLFD(xlfd, 7); + +#define Xstrlen(A) ((A)?strlen(A):0) + len = Xstrlen(xlfd)+Xstrlen(weight)+Xstrlen(slant)+Xstrlen(pxlsz)*2+60; +#undef Xstrlen + + buf = wmalloc(len + 1); + snprintf(buf, len + 1, "%s,-*-*-%s-%s-*-*-%s-*-*-*-*-*-*-*," + "-*-*-*-*-*-*-%s-*-*-*-*-*-*-*,*", + xlfd, weight, slant, pxlsz, pxlsz); + + wfree(pxlsz); + wfree(slant); + wfree(weight); + + return buf; +} + +/* XLFD pattern matching */ +static XFontSet +W_CreateFontSetWithGuess(Display *dpy, char *xlfd, char ***missing, + int *nmissing, char **def_string) +{ + XFontSet fs = XCreateFontSet(dpy, xlfd, missing, nmissing, def_string); + + if (fs != NULL && *nmissing == 0) return fs; + + /* for non-iso8859-1 language and iso8859-1 specification + (this fontset is only for pattern analysis) */ + if (fs == NULL) { + if (*nmissing != 0) XFreeStringList(*missing); + setlocale(LC_CTYPE, "C"); + fs = XCreateFontSet(dpy, xlfd, missing, nmissing, def_string); + setlocale(LC_CTYPE, ""); + } + + /* make XLFD font name for pattern analysis */ + if (fs != NULL) { + XFontStruct **fontstructs; + char **fontnames; + if (XFontsOfFontSet(fs, &fontstructs, &fontnames) > 0) + xlfd = fontnames[0]; + } + + xlfd = generalizeXLFD(xlfd); + + if (*nmissing != 0) XFreeStringList(*missing); + if (fs != NULL) XFreeFontSet(dpy, fs); + + fs = XCreateFontSet(dpy, xlfd, missing, nmissing, def_string); + + wfree(xlfd); + return fs; +} + + +static char* +xlfdFromFontName(char *fontName) +{ + char *systemFont, *boldSystemFont; + char *font; + int size; + + systemFont = WINGsConfiguration.systemFont; + boldSystemFont = WINGsConfiguration.boldSystemFont; + + size = WINGsConfiguration.defaultFontSize; + + if (strcmp(fontName, "SystemFont")==0) { + font = systemFont; + } else if (strncmp(fontName, "SystemFont-", 11)==0) { + font = systemFont; + if (sscanf(&fontName[11], "%i", &size)!=1) { + size = WINGsConfiguration.defaultFontSize; + wwarning(_("Invalid size specification '%s' in %s. " + "Using default %d\n"), &fontName[11], fontName, size); + } + } else if (strcmp(fontName, "BoldSystemFont")==0) { + font = boldSystemFont; + } else if (strncmp(fontName, "BoldSystemFont-", 15)==0) { + font = boldSystemFont; + if (sscanf(&fontName[15], "%i", &size)!=1) { + size = WINGsConfiguration.defaultFontSize; + wwarning(_("Invalid size specification '%s' in %s. " + "Using default %d\n"), &fontName[15], fontName, size); + } + } else { + font = NULL; + } + + return (font!=NULL ? makeFontSetOfSize(font, size) : wstrdup(fontName)); +} + + +WMFont* +WMCreateFontSet(WMScreen *scrPtr, char *fontName) +{ + WMFont *font; + Display *display = scrPtr->display; + char **missing; + int nmissing = 0; + char *defaultString; + char *fname; + XFontSetExtents *extents; + + fname = xlfdFromFontName(fontName); + + font = WMHashGet(scrPtr->fontSetCache, fname); + if (font) { + WMRetainFont(font); + wfree(fname); + return font; + } + + font = wmalloc(sizeof(WMFont)); + memset(font, 0, sizeof(WMFont)); + + font->notFontSet = 0; + + font->screen = scrPtr; + + font->font.set = W_CreateFontSetWithGuess(display, fname, &missing, + &nmissing, &defaultString); + if (nmissing > 0 && font->font.set) { + int i; + + wwarning(_("the following character sets are missing in %s:"), fname); + for (i = 0; i < nmissing; i++) { + wwarning(missing[i]); + } + XFreeStringList(missing); + if (defaultString) + wwarning(_("the string \"%s\" will be used in place of any characters from those sets."), + defaultString); + } + if (!font->font.set) { + wfree(font); + wfree(fname); + return NULL; + } + + extents = XExtentsOfFontSet(font->font.set); + + font->height = extents->max_logical_extent.height; + font->y = font->height - (font->height + extents->max_logical_extent.y); + + font->refCount = 1; + + font->name = fname; + + assert(WMHashInsert(scrPtr->fontSetCache, font->name, font)==NULL); + + return font; +} + + + +WMFont* +WMCreateNormalFont(WMScreen *scrPtr, char *fontName) +{ + WMFont *font; + Display *display = scrPtr->display; + char *fname, *ptr; + + fontName = xlfdFromFontName(fontName); + + if ((ptr = strchr(fontName, ','))) { + fname = wmalloc(ptr - fontName + 1); + strncpy(fname, fontName, ptr - fontName); + fname[ptr - fontName] = 0; + } else { + fname = wstrdup(fontName); + } + + wfree(fontName); + + font = WMHashGet(scrPtr->fontCache, fname); + if (font) { + WMRetainFont(font); + wfree(fname); + return font; + } + + font = wmalloc(sizeof(WMFont)); + memset(font, 0, sizeof(WMFont)); + + font->notFontSet = 1; + + font->screen = scrPtr; + + font->font.normal = XLoadQueryFont(display, fname); + if (!font->font.normal) { + wfree(font); + wfree(fname); + return NULL; + } + font->height = font->font.normal->ascent+font->font.normal->descent; + font->y = font->font.normal->ascent; + + font->refCount = 1; + + font->name = fname; + + assert(WMHashInsert(scrPtr->fontCache, font->name, font)==NULL); + + return font; +} + + +WMFont* +WMCreateFont(WMScreen *scrPtr, char *fontName) +{ + return WMCreateFontWithFlags(scrPtr, fontName, WFDefaultFont); +} + + +WMFont* +WMCreateFontWithFlags(WMScreen *scrPtr, char *fontName, WMFontFlags flags) +{ + Bool multiByte = scrPtr->useMultiByte; + WMFont *font; + + if (flags & WFFontSet) { + multiByte = True; + } else if (flags & WFNormalFont) { + multiByte = False; + } + + if (multiByte) { + font = WMCreateFontSet(scrPtr, fontName); + } else { + font = WMCreateNormalFont(scrPtr, fontName); + } + + return font; +} + + +WMFont* +WMRetainFont(WMFont *font) +{ + wassertrv(font!=NULL, NULL); + + font->refCount++; + + return font; +} + + +void +WMReleaseFont(WMFont *font) +{ + wassertr(font!=NULL); + + font->refCount--; + if (font->refCount < 1) { + if (font->notFontSet) { + XFreeFont(font->screen->display, font->font.normal); + } else { + XFreeFontSet(font->screen->display, font->font.set); + } + + if (font->name) { + if (font->notFontSet) { + WMHashRemove(font->screen->fontCache, font->name); + } else { + WMHashRemove(font->screen->fontSetCache, font->name); + } + wfree(font->name); + } + wfree(font); + } +} + + +Bool +WMIsAntialiasingEnabled(WMScreen *scrPtr) +{ + return False; +} + + +unsigned int +WMFontHeight(WMFont *font) +{ + wassertrv(font!=NULL, 0); + + return font->height; +} + + +char* +WMGetFontName(WMFont *font) +{ + wassertrv(font!=NULL, NULL); + + return font->name; +} + + +WMFont* +WMDefaultSystemFont(WMScreen *scrPtr) +{ + return WMRetainFont(scrPtr->normalFont); +} + + +WMFont* +WMDefaultBoldSystemFont(WMScreen *scrPtr) +{ + return WMRetainFont(scrPtr->boldFont); +} + + +static WMFont* +makeSystemFontOfSize(WMScreen *scrPtr, int size, Bool bold) +{ + WMFont *font; + char *fontSpec; + +#define WConf WINGsConfiguration + if (bold) { + fontSpec = makeFontSetOfSize(WConf.boldSystemFont, size); + } else { + fontSpec = makeFontSetOfSize(WConf.systemFont, size); + } +#undef WConf + + if (scrPtr->useMultiByte) { + font = WMCreateFontSet(scrPtr, fontSpec); + } else { + font = WMCreateNormalFont(scrPtr, fontSpec); + } + + if (!font) { + if (scrPtr->useMultiByte) { + wwarning(_("could not load font set %s. Trying fixed."), fontSpec); + font = WMCreateFontSet(scrPtr, "fixed"); + if (!font) { + font = WMCreateFontSet(scrPtr, "-*-fixed-medium-r-normal-*-14-*-*-*-*-*-*-*"); + } + } else { + wwarning(_("could not load font %s. Trying fixed."), fontSpec); + font = WMCreateNormalFont(scrPtr, "fixed"); + } + if (!font) { + wwarning(_("could not load fixed font!")); + wfree(fontSpec); + return NULL; + } + } + wfree(fontSpec); + + return font; +} + + +WMFont* +WMSystemFontOfSize(WMScreen *scrPtr, int size) +{ + return makeSystemFontOfSize(scrPtr, size, False); +} + + +WMFont* +WMBoldSystemFontOfSize(WMScreen *scrPtr, int size) +{ + return makeSystemFontOfSize(scrPtr, size, True); +} + + +XFontSet +WMGetFontFontSet(WMFont *font) +{ + wassertrv(font!=NULL, NULL); + + if (!font->notFontSet && !font->antialiased) + return font->font.set; + + return NULL; +} + + +int +WMWidthOfString(WMFont *font, char *text, int length) +{ + wassertrv(font!=NULL, 0); + wassertrv(text!=NULL, 0); + + if (font->notFontSet) { + return XTextWidth(font->font.normal, text, length); + } else { + XRectangle rect; + XRectangle AIXsucks; + + XmbTextExtents(font->font.set, text, length, &AIXsucks, &rect); + + return rect.width; + } +} + + + +void +WMDrawString(WMScreen *scr, Drawable d, WMColor *color, WMFont *font, + int x, int y, char *text, int length) +{ + wassertr(font!=NULL); + + if (font->notFontSet) { + XSetFont(scr->display, scr->drawStringGC, font->font.normal->fid); + XSetForeground(scr->display, scr->drawStringGC, W_PIXEL(color)); + XDrawString(scr->display, d, scr->drawStringGC, x, y + font->y, + text, length); + } else { + XSetForeground(scr->display, scr->drawStringGC, W_PIXEL(color)); + XmbDrawString(scr->display, d, font->font.set, scr->drawStringGC, + x, y + font->y, text, length); + } +} + + +void +WMDrawImageString(WMScreen *scr, Drawable d, WMColor *color, WMColor *background, + WMFont *font, int x, int y, char *text, int length) +{ + wassertr(font!=NULL); + + if (font->notFontSet) { + XSetForeground(scr->display, scr->drawImStringGC, W_PIXEL(color)); + XSetBackground(scr->display, scr->drawImStringGC, W_PIXEL(background)); + XSetFont(scr->display, scr->drawImStringGC, font->font.normal->fid); + XDrawImageString(scr->display, d, scr->drawImStringGC, + x, y + font->y, text, length); + } else { + XSetForeground(scr->display, scr->drawImStringGC, W_PIXEL(color)); + XSetBackground(scr->display, scr->drawImStringGC, W_PIXEL(background)); + XmbDrawImageString(scr->display, d, font->font.set, scr->drawImStringGC, + x, y + font->y, text, length); + } +} + + + + +static char* +makeFontSetOfSize(char *fontset, int size) +{ + char font[300], *f; + char *newfs = NULL; + char *ptr; + + do { + char *tmp; + int end; + + + f = fontset; + ptr = strchr(fontset, ','); + if (ptr) { + int count = ptr-fontset; + + if (count > 255) { + wwarning(_("font description %s is too large."), fontset); + } else { + memcpy(font, fontset, count); + font[count] = 0; + f = (char*)font; + } + } + + if (newfs) + end = strlen(newfs); + else + end = 0; + + tmp = wmalloc(end + strlen(f) + 8); + if (end != 0) { + sprintf(tmp, "%s,", newfs); + sprintf(tmp + end + 1, f, size); + } else { + sprintf(tmp + end, f, size); + } + + if (newfs) + wfree(newfs); + newfs = tmp; + + fontset = ptr+1; + } while (ptr!=NULL); + + return newfs; +} + + +#define FONT_PROPS 14 + +typedef struct { + char *props[FONT_PROPS]; +} W_FontAttributes; + + +static void +changeFontProp(char *buf, char *newprop, int position) +{ + char buf2[512]; + char *ptr, *pptr, *rptr; + int count; + + if (buf[0]!='-') { + /* // remove warning later. or maybe not */ + wwarning(_("Invalid font specification: '%s'\n"), buf); + return; + } + + ptr = pptr = rptr = buf; + count = 0; + while (*ptr && *ptr!=',') { + if (*ptr == '-') { + count++; + if (count-1==position+1) { + rptr = ptr; + break; + } + if (count-1==position) { + pptr = ptr+1; + } + } + ptr++; + } + if (position==FONT_PROPS-1) { + rptr = ptr; + } + + *pptr = 0; + snprintf(buf2, 512, "%s%s%s", buf, newprop, rptr); + strcpy(buf, buf2); +} + + +static WMArray* +getOptions(char *options) +{ + char *ptr, *ptr2, *str; + WMArray *result; + int count; + + result = WMCreateArrayWithDestructor(2, (WMFreeDataProc*)wfree); + + ptr = options; + while (1) { + ptr2 = strchr(ptr, ','); + if (!ptr2) { + WMAddToArray(result, wstrdup(ptr)); + break; + } else { + count = ptr2 - ptr; + str = wmalloc(count+1); + memcpy(str, ptr, count); + str[count] = 0; + WMAddToArray(result, str); + ptr = ptr2 + 1; + } + } + + return result; +} + + +#define WFAUnchanged (NULL) +/* Struct for font change operations */ +typedef struct WMFontAttributes { + char *foundry; + char *family; + char *weight; + char *slant; + char *setWidth; + char *addStyle; + char *pixelSize; + char *pointSize; + char *resolutionX; + char *resolutionY; + char *spacing; + char *averageWidth; + char *registry; + char *encoding; +} WMFontAttributes; + +WMFont* +WMCopyFontWithChanges(WMScreen *scrPtr, WMFont *font, + const WMFontAttributes *changes) +{ + int index[FONT_PROPS], count[FONT_PROPS]; + int totalProps, i, j, carry; + char fname[512]; + WMFontFlags fFlags; + WMBag *props; + WMArray *options; + WMFont *result; + char *prop; + + snprintf(fname, 512, "%s", font->name); + + fFlags = (font->antialiased ? WFAntialiased : WFNotAntialiased); + fFlags |= (font->notFontSet ? WFNormalFont : WFFontSet); + + props = WMCreateBagWithDestructor(1, (WMFreeDataProc*)WMFreeArray); + + totalProps = 0; + for (i=0; iprops[i]; + count[i] = index[i] = 0; + if (!prop) { + /* No change for this property */ + continue; + } else if (strchr(prop, ',')==NULL) { + /* Simple option */ + changeFontProp(fname, prop, i); + } else { + /* Option with fallback alternatives */ + if ((changes==WFAEmphasized || changes==WFABoldEmphasized) && + font->antialiased && strcmp(prop, "o,i")==0) { + options = getOptions("i,o"); + } else { + options = getOptions(prop); + } + WMInsertInBag(props, i, options); + count[i] = WMGetArrayItemCount(options); + if (totalProps==0) + totalProps = 1; + totalProps = totalProps * count[i]; + } + } + + if (totalProps == 0) { + /* No options with fallback alternatives at all */ + WMFreeBag(props); + return WMCreateFontWithFlags(scrPtr, fname, fFlags); + } + + for (i=0; i=0; j--) { + if (count[j]!=0) { + index[j] += carry; + carry = (index[j]==count[j]); + index[j] %= count[j]; + } + } + } + + WMFreeBag(props); + + return NULL; +} + +// should WFANormal also set "normal" or leave it alone? +static const WMFontAttributes W_FANormal = { + WFAUnchanged, WFAUnchanged, "medium,normal,regular", "r", "normal", + WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, + WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged +}; + + +static const WMFontAttributes W_FABold = { + WFAUnchanged, WFAUnchanged, "bold", WFAUnchanged, + WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, + WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged +}; + + +static const WMFontAttributes W_FANotBold = { + WFAUnchanged, WFAUnchanged, "medium,normal,regular", WFAUnchanged, + WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, + WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged +}; + + +static const WMFontAttributes W_FAEmphasized = { + WFAUnchanged, WFAUnchanged, WFAUnchanged, "o,i", + WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, + WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged +}; + + +static const WMFontAttributes W_FANotEmphasized = { + WFAUnchanged, WFAUnchanged, WFAUnchanged, "r", + WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, + WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged +}; + + +static const WMFontAttributes W_FABoldEmphasized = { + WFAUnchanged, WFAUnchanged, "bold", "o,i", + WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, + WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged, WFAUnchanged +}; + + +const WMFontAttributes *WFANormal = &W_FANormal; +const WMFontAttributes *WFABold = &W_FABold; +const WMFontAttributes *WFANotBold = &W_FANotBold; +const WMFontAttributes *WFAEmphasized = &W_FAEmphasized; +const WMFontAttributes *WFANotEmphasized = &W_FANotEmphasized; +const WMFontAttributes *WFABoldEmphasized = &W_FABoldEmphasized; + + +#endif + diff -Naur WindowMaker-0.91.0/WINGs/wfont_wchar.c wm/WINGs/wfont_wchar.c --- WindowMaker-0.91.0/WINGs/wfont_wchar.c 1970-01-01 03:00:00 +0300 +++ wm/WINGs/wfont_wchar.c 2004-10-12 05:34:32 +0400 @@ -0,0 +1,599 @@ + +#include "wconfig.h" + +#ifdef XFT + +#include +#include + +#if defined(HAVE_MBSNRTOWCS) +# define __USE_GNU +#endif + +#ifdef HAVE_WCHAR_H +# include +#endif + +#include + +#include "WINGsP.h" + +#include +#include +#include + + +// && defined(HAVE_MBSTATE_T___COUNT) +// in configure.ac use AC_CHECK_MEMBER(struct mbstate_t.__count, +// have=1, have=0, [#include ]) +#if defined(HAVE_MBSNRTOWCS) + +static size_t +wmbsnrtowcs(wchar_t *dest, const char **src, size_t nbytes, size_t len) +{ + mbstate_t ps; + size_t n; + + memset(&ps, 0, sizeof(mbstate_t)); + n = mbsnrtowcs(dest, src, nbytes, len, &ps); + if (n!=(size_t)-1 && *src) { + *src -= ps.__count; + } + + return n; +} + +#elif defined(HAVE_MBRTOWC) + +// This is 8 times slower than the version above. +static size_t +wmbsnrtowcs(wchar_t *dest, const char **src, size_t nbytes, size_t len) +{ + mbstate_t ps; + const char *ptr; + size_t n; + int nb; + + if (nbytes==0) + return 0; + + memset(&ps, 0, sizeof(mbstate_t)); + + if (dest == NULL) { + for (ptr=*src, n=0; nbytes>0; n++) { + nb = mbrtowc(NULL, ptr, nbytes, &ps); + if (nb == -1) { + return ((size_t)-1); + } else if (nb==0 || nb==-2) { + return n; + } + ptr += nb; + nbytes -= nb; + } + } + + for (ptr=*src, n=0; n0; n++, dest++) { + nb = mbrtowc(dest, ptr, nbytes, &ps); + if (nb == -2) { + *src = ptr; + return n; + } else if (nb == -1) { + *src = ptr; + return ((size_t)-1); + } else if (nb == 0) { + *src = NULL; + return n; + } + ptr += nb; + nbytes -= nb; + } + + *src = ptr; + return n; +} + +#else + +// Not only 8 times slower than the version based on mbsnrtowcs +// but also this version is not thread safe nor reentrant + +static size_t +wmbsnrtowcs(wchar_t *dest, const char **src, size_t nbytes, size_t len) +{ + const char *ptr; + size_t n; + int nb; + + if (nbytes==0) + return 0; + + mbtowc(NULL, NULL, 0); /* reset shift state */ + + if (dest == NULL) { + for (ptr=*src, n=0; nbytes>0; n++) { + nb = mbtowc(NULL, ptr, nbytes); + if (nb == -1) { + mbtowc(NULL, NULL, 0); + nb = mbtowc(NULL, ptr, strlen(ptr)); + return (nb == -1 ? (size_t)-1 : n); + } else if (nb==0) { + return n; + } + ptr += nb; + nbytes -= nb; + } + } + + for (ptr=*src, n=0; n0; n++, dest++) { + nb = mbtowc(dest, ptr, nbytes); + if (nb == -1) { + mbtowc(NULL, NULL, 0); + nb = mbtowc(NULL, ptr, strlen(ptr)); + *src = ptr; + return (nb == -1 ? (size_t)-1 : n); + } else if (nb == 0) { + *src = NULL; + return n; + } + ptr += nb; + nbytes -= nb; + } + + *src = ptr; + return n; +} + +#endif + + +#define DEFAULT_SIZE 12 + +static char* +fixXLFD(char *xlfd, int size) +{ + char *fname, *ptr; + + fname = wmalloc(strlen(xlfd) + 20); + if (strstr(xlfd, "%d")!=NULL) + sprintf(fname, xlfd, size ? size : DEFAULT_SIZE); + else + strcpy(fname, xlfd); + + if ((ptr = strchr(fname, ','))) { + *ptr = 0; + } + + return fname; +} + + +static Bool +hasProperty(FcPattern *pattern, const char *property) +{ + FcValue val; + + if (FcPatternGet(pattern, property, 0, &val)==FcResultMatch) { + return True; + } + + return False; +} + + +static Bool +hasPropertyWithStringValue(FcPattern *pattern, const char *object, char *value) +{ + FcChar8 *str; + int id; + + if (!value || value[0]==0) + return True; + + id = 0; + while (FcPatternGetString(pattern, object, id, &str)==FcResultMatch) { + if (strcasecmp(value, (char*)str) == 0) { + return True; + } + id++; + } + + return False; +} + + +// also handle an xlfd with %d for size? +static char* +makeFontOfSize(char *font, int size, char *fallback) +{ + FcPattern *pattern; + char *result; + + if (font[0]=='-') { + char *fname; + + fname = fixXLFD(font, size); + pattern = XftXlfdParse(fname, False, False); + wfree(fname); + } else { + pattern = FcNameParse(font); + } + + //FcPatternPrint(pattern); + if (size > 0) { + FcPatternDel(pattern, "pixelsize"); + FcPatternAddDouble(pattern, "pixelsize", (double)size); + } else if (size==0 && !hasProperty(pattern, "size") && + !hasProperty(pattern, "pixelsize")) { + FcPatternAddDouble(pattern, "pixelsize", (double)DEFAULT_SIZE); + } + + if (fallback && !hasPropertyWithStringValue(pattern, "family", fallback)) { + FcPatternAddString(pattern, "family", fallback); + } + + result = FcNameUnparse(pattern); + FcPatternDestroy(pattern); + + return result; +} + + +WMFont* +WMCreateFont(WMScreen *scrPtr, char *fontName) +{ + WMFont *font; + Display *display = scrPtr->display; + char *fname, *ptr; + + /* This is for back-compat (to allow reading of old xlfd descriptions) */ + if (fontName[0]=='-' && (ptr = strchr(fontName, ','))) { + // warn for deprecation + fname = wmalloc(ptr - fontName + 1); + strncpy(fname, fontName, ptr - fontName); + fname[ptr - fontName] = 0; + } else { + fname = wstrdup(fontName); + } + + font = WMHashGet(scrPtr->fontCache, fname); + if (font) { + WMRetainFont(font); + wfree(fname); + return font; + } + + font = wmalloc(sizeof(WMFont)); + memset(font, 0, sizeof(WMFont)); + + font->screen = scrPtr; + + // remove + printf("WMCreateFont: %s\n", fname); + + if (fname[0] == '-') { + // Backward compat thing. Remove in a later version + font->font = XftFontOpenXlfd(display, scrPtr->screen, fname); + } else { + font->font = XftFontOpenName(display, scrPtr->screen, fname); + } + if (!font->font) { + wfree(font); + wfree(fname); + return NULL; + } + font->height = font->font->ascent+font->font->descent; + font->y = font->font->ascent; + + font->refCount = 1; + + font->name = fname; + + assert(WMHashInsert(scrPtr->fontCache, font->name, font)==NULL); + + return font; +} + + +WMFont* +WMRetainFont(WMFont *font) +{ + wassertrv(font!=NULL, NULL); + + font->refCount++; + + return font; +} + + +void +WMReleaseFont(WMFont *font) +{ + wassertr(font!=NULL); + + font->refCount--; + if (font->refCount < 1) { + XftFontClose(font->screen->display, font->font); + if (font->name) { + WMHashRemove(font->screen->fontCache, font->name); + wfree(font->name); + } + wfree(font); + } +} + + +Bool +WMIsAntialiasingEnabled(WMScreen *scrPtr) +{ + return scrPtr->antialiasedText; +} + + +unsigned int +WMFontHeight(WMFont *font) +{ + wassertrv(font!=NULL, 0); + + return font->height; +} + + +char* +WMGetFontName(WMFont *font) +{ + wassertrv(font!=NULL, NULL); + + return font->name; +} + + +WMFont* +WMDefaultSystemFont(WMScreen *scrPtr) +{ + return WMRetainFont(scrPtr->normalFont); +} + + +WMFont* +WMDefaultBoldSystemFont(WMScreen *scrPtr) +{ + return WMRetainFont(scrPtr->boldFont); +} + + +WMFont* +WMSystemFontOfSize(WMScreen *scrPtr, int size) +{ + WMFont *font; + char *fontSpec; + + fontSpec = makeFontOfSize(WINGsConfiguration.systemFont, size, "sans"); + + font = WMCreateFont(scrPtr, fontSpec); + + if (!font) { + wwarning(_("could not load font %s."), fontSpec); + } + + wfree(fontSpec); + + return font; +} + + +WMFont* +WMBoldSystemFontOfSize(WMScreen *scrPtr, int size) +{ + WMFont *font; + char *fontSpec; + + fontSpec = makeFontOfSize(WINGsConfiguration.boldSystemFont, size, "sans"); + + font = WMCreateFont(scrPtr, fontSpec); + + if (!font) { + wwarning(_("could not load font %s."), fontSpec); + } + + wfree(fontSpec); + + return font; +} + + +int +WMWidthOfString(WMFont *font, char *text, int length) +{ + XGlyphInfo extents; + + wassertrv(font!=NULL, 0); + wassertrv(text!=NULL, 0); + + if (font->screen->useWideChar) { + wchar_t *wtext; + const char *mtext; + int len; + + wtext = (wchar_t *)wmalloc(sizeof(wchar_t)*(length+1)); + mtext = text; + len = wmbsnrtowcs(wtext, &mtext, length, length); + if (len>0) { + wtext[len] = L'\0'; /* not really necessary here */ + XftTextExtents32(font->screen->display, font->font, + (XftChar32 *)wtext, len, &extents); + } else { + if (len==-1) { + wwarning(_("Conversion to widechar failed (possible " + "invalid multibyte sequence): '%s':(pos %d)\n"), + text, mtext-text+1); + } + extents.xOff = 0; + } + wfree(wtext); + } else if (font->screen->useMultiByte) { + XftTextExtentsUtf8(font->screen->display, font->font, + (XftChar8 *)text, length, &extents); + } else { + XftTextExtents8(font->screen->display, font->font, + (XftChar8 *)text, length, &extents); + } + + return extents.xOff; /* don't ask :P */ +} + + + +void +WMDrawString(WMScreen *scr, Drawable d, WMColor *color, WMFont *font, + int x, int y, char *text, int length) +{ + XftColor xftcolor; + + wassertr(font!=NULL); + + xftcolor.color.red = color->color.red; + xftcolor.color.green = color->color.green; + xftcolor.color.blue = color->color.blue; + xftcolor.color.alpha = color->alpha;; + xftcolor.pixel = W_PIXEL(color); + + XftDrawChange(scr->xftdraw, d); + + if (font->screen->useWideChar) { + wchar_t *wtext; + const char *mtext; + int len; + + wtext = (wchar_t *)wmalloc(sizeof(wchar_t)*(length+1)); + mtext = text; + len = wmbsnrtowcs(wtext, &mtext, length, length); + if (len>0) { + XftDrawString32(scr->xftdraw, &xftcolor, font->font, + x, y + font->y, (XftChar32*)wtext, len); + } else if (len==-1) { + wwarning(_("Conversion to widechar failed (possible invalid " + "multibyte sequence): '%s':(pos %d)\n"), + text, mtext-text+1); + /* we can draw normal text, or we can draw as much widechar + * text as was already converted until the error. go figure */ + /*XftDrawString8(scr->xftdraw, &xftcolor, font->font, + x, y + font->y, (XftChar8*)text, length);*/ + } + wfree(wtext); + } else if (font->screen->useMultiByte) { + XftDrawStringUtf8(scr->xftdraw, &xftcolor, font->font, + x, y + font->y, (XftChar8*)text, length); + } else { + XftDrawString8(scr->xftdraw, &xftcolor, font->font, + x, y + font->y, (XftChar8*)text, length); + } +} + + +void +WMDrawImageString(WMScreen *scr, Drawable d, WMColor *color, WMColor *background, + WMFont *font, int x, int y, char *text, int length) +{ + XftColor textColor; + XftColor bgColor; + + wassertr(font!=NULL); + + textColor.color.red = color->color.red; + textColor.color.green = color->color.green; + textColor.color.blue = color->color.blue; + textColor.color.alpha = color->alpha;; + textColor.pixel = W_PIXEL(color); + + bgColor.color.red = background->color.red; + bgColor.color.green = background->color.green; + bgColor.color.blue = background->color.blue; + bgColor.color.alpha = background->alpha;; + bgColor.pixel = W_PIXEL(background); + + XftDrawChange(scr->xftdraw, d); + + XftDrawRect(scr->xftdraw, &bgColor, x, y, + WMWidthOfString(font, text, length), + font->height); + + if (font->screen->useWideChar) { + wchar_t *wtext; + const char *mtext; + int len; + + mtext = text; + wtext = (wchar_t *)wmalloc(sizeof(wchar_t)*(length+1)); + len = wmbsnrtowcs(wtext, &mtext, length, length); + if (len>0) { + XftDrawString32(scr->xftdraw, &textColor, font->font, + x, y + font->y, (XftChar32*)wtext, len); + } else if (len==-1) { + wwarning(_("Conversion to widechar failed (possible invalid " + "multibyte sequence): '%s':(pos %d)\n"), + text, mtext-text+1); + /* we can draw normal text, or we can draw as much widechar + * text as was already converted until the error. go figure */ + /*XftDrawString8(scr->xftdraw, &textColor, font->font, + x, y + font->y, (XftChar8*)text, length);*/ + } + wfree(wtext); + } else if (font->screen->useMultiByte) { + XftDrawStringUtf8(scr->xftdraw, &textColor, font->font, + x, y + font->y, (XftChar8*)text, length); + } else { + XftDrawString8(scr->xftdraw, &textColor, font->font, + x, y + font->y, (XftChar8*)text, length); + } +} + + +WMFont* +WMCopyFontWithStyle(WMScreen *scrPtr, WMFont *font, WMFontStyle style) +{ + FcPattern *pattern; + WMFont *copy; + char *name; + + if (!font) + return NULL; + + pattern = FcNameParse(WMGetFontName(font)); + switch (style) { + case WFSNormal: + FcPatternDel(pattern, "weight"); + FcPatternDel(pattern, "slant"); + FcPatternAddString(pattern, "weight", "regular"); + FcPatternAddString(pattern, "weight", "medium"); + FcPatternAddString(pattern, "slant", "roman"); + break; + case WFSBold: + FcPatternDel(pattern, "weight"); + FcPatternAddString(pattern, "weight", "bold"); + break; + case WFSEmphasized: + FcPatternDel(pattern, "slant"); + FcPatternAddString(pattern, "slant", "italic"); + FcPatternAddString(pattern, "slant", "oblique"); + break; + case WFSBoldEmphasized: + FcPatternDel(pattern, "weight"); + FcPatternDel(pattern, "slant"); + FcPatternAddString(pattern, "weight", "bold"); + FcPatternAddString(pattern, "slant", "italic"); + FcPatternAddString(pattern, "slant", "oblique"); + break; + } + + name = FcNameUnparse(pattern); + copy = WMCreateFont(scrPtr, name); + FcPatternDestroy(pattern); + wfree(name); + + return copy; +} + + +#endif /* XFT */ + + diff -Naur WindowMaker-0.91.0/WINGs/widgets.c wm/WINGs/widgets.c --- WindowMaker-0.91.0/WINGs/widgets.c 2004-10-24 01:27:47 +0400 +++ wm/WINGs/widgets.c 2004-10-28 08:17:18 +0400 @@ -631,9 +631,6 @@ scrPtr->xftdraw = XftDrawCreate(scrPtr->display, W_DRAWABLE(scrPtr), scrPtr->visual, scrPtr->colormap); - /* create input method stuff */ - W_InitIMStuff(scrPtr); - /* Create missing CUT_BUFFERs */ { Atom *rootWinProps; @@ -773,6 +770,9 @@ return NULL; } + /* create input method stuff */ + W_InitIM(scrPtr); + scrPtr->checkButtonImageOn = makePixmap(scrPtr, CHECK_BUTTON_ON, CHECK_BUTTON_ON_WIDTH, CHECK_BUTTON_ON_HEIGHT, False); diff -Naur WindowMaker-0.91.0/WINGs/WINGs/CVS/Entries wm/WINGs/WINGs/CVS/Entries --- WindowMaker-0.91.0/WINGs/WINGs/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WINGs/WINGs/CVS/Entries 2005-05-17 22:43:12 +0400 @@ -0,0 +1,7 @@ +/.cvsignore/1.1/Thu Jan 18 19:21:57 2001// +/Makefile.am/1.2/Wed Oct 3 02:05:53 2001// +/WINGs.h/1.52/Sat Oct 30 06:39:27 2004// +/WINGsP.h/1.30/Sat Oct 30 06:39:27 2004// +/WUtil.h/1.25/Fri Mar 11 01:56:07 2005// +/proplist-compat.h/1.5/Mon Dec 17 14:46:33 2001// +D diff -Naur WindowMaker-0.91.0/WINGs/WINGs/CVS/Repository wm/WINGs/WINGs/CVS/Repository --- WindowMaker-0.91.0/WINGs/WINGs/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WINGs/WINGs/CVS/Repository 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +wm/WINGs/WINGs diff -Naur WindowMaker-0.91.0/WINGs/WINGs/CVS/Root wm/WINGs/WINGs/CVS/Root --- WindowMaker-0.91.0/WINGs/WINGs/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WINGs/WINGs/CVS/Root 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WINGs/WINGs/.cvsignore wm/WINGs/WINGs/.cvsignore --- WindowMaker-0.91.0/WINGs/WINGs/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WINGs/WINGs/.cvsignore 2001-01-18 22:21:57 +0300 @@ -0,0 +1 @@ +Makefile Makefile.in diff -Naur WindowMaker-0.91.0/WINGs/WINGs/Makefile.in wm/WINGs/WINGs/Makefile.in --- WindowMaker-0.91.0/WINGs/WINGs/Makefile.in 2004-10-26 08:10:45 +0400 +++ wm/WINGs/WINGs/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,267 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -AUTOMAKE_OPTIONS = no-dependencies - -# is this a kluge? if so, how should i do it? -includedir = @includedir@/WINGs - -include_HEADERS = WINGs.h WUtil.h WINGsP.h proplist-compat.h -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -HEADERS = $(include_HEADERS) - -DIST_COMMON = Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WINGs/WINGs/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir) - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \ - done - -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/$$p; \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WINGs/WINGs - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-includeHEADERS -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-includeHEADERS -uninstall: uninstall-am -all-am: Makefile $(HEADERS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(includedir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-tags clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-tags distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: uninstall-includeHEADERS install-includeHEADERS tags \ -mostlyclean-tags distclean-tags clean-tags maintainer-clean-tags \ -distdir info-am info dvi-am dvi check check-am installcheck-am \ -installcheck install-exec-am install-exec install-data-am install-data \ -install-am install uninstall-am uninstall all-redirect all-am all \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WINGs/WINGs/WINGs.h wm/WINGs/WINGs/WINGs.h --- WindowMaker-0.91.0/WINGs/WINGs/WINGs.h 2004-10-25 05:48:39 +0400 +++ wm/WINGs/WINGs/WINGs.h 2004-10-30 10:39:27 +0400 @@ -7,7 +7,7 @@ #include #include -#define WINGS_H_VERSION 20040406 +#define WINGS_H_VERSION 20041030 #ifdef __cplusplus diff -Naur WindowMaker-0.91.0/WINGs/WINGs/WINGsP.h wm/WINGs/WINGs/WINGsP.h --- WindowMaker-0.91.0/WINGs/WINGs/WINGsP.h 2004-10-24 01:27:47 +0400 +++ wm/WINGs/WINGs/WINGsP.h 2004-10-30 10:39:27 +0400 @@ -8,7 +8,7 @@ #include -#if WINGS_H_VERSION < 20040406 +#if WINGS_H_VERSION < 20041030 #error There_is_an_old_WINGs.h_file_somewhere_in_your_system._Please_remove_it. #endif @@ -385,6 +385,7 @@ WMPixmap *dragImage; int helpContext; + XIC xic; struct { unsigned int realized:1; @@ -612,6 +613,22 @@ void W_FreeViewXdndPart(WMView *view); +/* XIM */ +void W_InitIM(WMScreen *scr); + +void W_CreateIC(WMView *view); + +void W_DestroyIC(WMView *view); + +void W_FocusIC(WMView *view); + +void W_UnFocusIC(WMView *view); + +void W_SetPreeditPositon(W_View *view, int x, int y); + +int W_LookupString(W_View *view, XKeyPressedEvent *event, char *buffer, + int buflen, KeySym *keysym, Status *status); + #ifdef __cplusplus } #endif /* __cplusplus */ diff -Naur WindowMaker-0.91.0/WINGs/WINGs/WUtil.h wm/WINGs/WINGs/WUtil.h --- WindowMaker-0.91.0/WINGs/WINGs/WUtil.h 2004-10-12 23:47:44 +0400 +++ wm/WINGs/WINGs/WUtil.h 2005-03-11 04:56:07 +0300 @@ -234,9 +234,12 @@ char* wgethomedir(); void* wmalloc(size_t size); +void* wmalloc0(size_t size); void* wrealloc(void *ptr, size_t newsize); void wfree(void *ptr); +#define wnew(type, count) wmalloc(sizeof(type)*count) +#define wnew0(type, count) wmalloc0(sizeof(type)*count) void wrelease(void *ptr); void* wretain(void *ptr); diff -Naur WindowMaker-0.91.0/WINGs/winputmethod.c wm/WINGs/winputmethod.c --- WindowMaker-0.91.0/WINGs/winputmethod.c 2004-10-23 03:58:59 +0400 +++ wm/WINGs/winputmethod.c 2004-10-28 08:17:18 +0400 @@ -5,83 +5,237 @@ #include "WINGsP.h" - typedef struct W_IMContext { XIM xim; - - struct W_ICContext *icList; + XIMStyle ximstyle; } WMIMContext; -typedef struct W_ICContext { - struct W_ICContext *next; - struct W_ICContext *prev; - - XIC xic; -} WMICContext; +static void +instantiateIM_cb(Display *display, XPointer client_data, XPointer call_data) +{ + W_InitIM((W_Screen *)client_data); +} -Bool -W_InitIMStuff(WMScreen *scr) +static void +destroyIM_cb(XIM xim, XPointer client_data, XPointer call_data) { - WMIMContext *ctx; + W_Screen *scr = (W_Screen *)client_data; + W_View *target; - ctx = scr->imctx = wmalloc(sizeof(WMIMContext)); + if (scr->imctx->xim != xim) + return; - ctx->xim = XOpenIM(scr->display, NULL, NULL, NULL); - if (ctx->xim == NULL) { - wwarning("could not open IM"); - return False; + target = scr->rootView->childrenList; + while (target!=NULL) { + W_DestroyIC(target); + target = target->nextSister; } + wfree(scr->imctx); + scr->imctx = NULL; + + XRegisterIMInstantiateCallback(scr->display, NULL, NULL, NULL, + instantiateIM_cb, (XPointer)scr); } void -W_CloseIMStuff(WMScreen *scr) +W_InitIM(W_Screen *scr) { - if (!scr->imctx) + XIM xim; + + if (scr->imctx) return; - if (scr->imctx->xim) - XCloseIM(scr->imctx->xim); - wfree(scr->imctx); - scr->imctx = NULL; -} + xim = XOpenIM(scr->display, NULL, NULL, NULL); + if (xim) { + XIMStyles *im_styles; + XIMCallback cb; + int i; + + scr->imctx = wmalloc(sizeof(WMIMContext)); + scr->imctx->xim = xim; + + cb.callback = destroyIM_cb; + cb.client_data = (XPointer)scr; + if (XSetIMValues(scr->imctx->xim, XNDestroyCallback, &cb, NULL)) + wwarning("could not add destroy callback for input method"); + XUnregisterIMInstantiateCallback(scr->display, NULL, NULL, NULL, + instantiateIM_cb, (XPointer)scr); + /* Get available input style */ + XGetIMValues(scr->imctx->xim, XNQueryInputStyle, &im_styles, NULL); + + scr->imctx->ximstyle = 0; + + for (i=0; icount_styles && scr->imctx->ximstyle==0; i++) { + if ((im_styles->supported_styles[i] & XIMPreeditPosition) && + (im_styles->supported_styles[i] & XIMStatusNothing)) { + scr->imctx->ximstyle = XIMPreeditPosition | XIMStatusNothing; + } else if ((im_styles->supported_styles[i] & XIMPreeditNothing) && + (im_styles->supported_styles[i] & XIMStatusNothing)) { + scr->imctx->ximstyle = XIMPreeditNothing | XIMStatusNothing; + } + } + XFree(im_styles); + } else { + XRegisterIMInstantiateCallback(scr->display, NULL, NULL, NULL, + instantiateIM_cb, (XPointer)scr); + } +} -WMICContext* +void W_CreateIC(WMView *view) { WMScreen *scr = W_VIEW_SCREEN(view); - WMICContext *ctx; + XVaNestedList preedit_attr = NULL; + + if (view->xic || !view->flags.realized || !scr->imctx) + return; + + if (scr->imctx->ximstyle & XIMPreeditPosition) { + XPoint spot; + XRectangle rect; + int ofs; + + ofs = (view->size.height - WMFontHeight(scr->normalFont))/2; + + rect.x = ofs; + rect.y = ofs; + rect.height = WMFontHeight(scr->normalFont); + rect.width = view->size.width - ofs*2; + spot.x = rect.x; + spot.y = rect.y + rect.height; + + // this really needs to be changed, but I don't know how yet -Dan + // it used to be like this with fontsets, but no longer applies to xft + preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, + XNArea, &rect, XNFontInfo, + scr->normalFont->font, NULL); + } + + view->xic = XCreateIC(scr->imctx->xim, XNInputStyle, scr->imctx->ximstyle, + XNClientWindow, view->window, + preedit_attr ? XNPreeditAttributes : NULL, preedit_attr, + NULL); + + if (preedit_attr) + XFree(preedit_attr); + + if (view->xic) { + unsigned long fevent = 0; + XGetICValues(view->xic, XNFilterEvents, &fevent, NULL); + XSelectInput(scr->display, view->window, + ButtonPressMask | ButtonReleaseMask | ExposureMask | + KeyPressMask | FocusChangeMask| ButtonMotionMask |fevent); + } +} + + +void +W_DestroyIC(WMView *view) +{ + if (view->xic) { + XDestroyIC(view->xic); + view->xic = 0; + } +} + + +static void +setPreeditArea(W_View *view) +{ + WMScreen *scr = W_VIEW_SCREEN(view); + XVaNestedList preedit_attr = NULL; + + if (view->xic && (scr->imctx->ximstyle & XIMPreeditPosition)) { + XRectangle rect; + int ofs; + + ofs = (view->size.height - WMFontHeight(scr->normalFont))/2; + rect.x = ofs; + rect.y = ofs; + rect.height = WMFontHeight(scr->normalFont); + rect.width = view->size.width - ofs*2; + + preedit_attr = XVaCreateNestedList(0, XNArea, &rect, NULL); + XSetICValues(view->xic, XNPreeditAttributes, preedit_attr, NULL); + + if (preedit_attr) { + XFree(preedit_attr); + } + } +} - ctx->prev = NULL; - ctx->next = scr->imctx->icList; - if (scr->imctx->icList) - scr->imctx->icList->prev = ctx; +void +W_FocusIC(WMView *view) +{ + WMScreen *scr = W_VIEW_SCREEN(view); + if (view->xic) { + XSetICFocus(view->xic); + XSetICValues(view->xic, XNFocusWindow, view->window, NULL); + + if (scr->imctx->ximstyle & XIMPreeditPosition) { + setPreeditArea(view); + } + } } void -W_DestroyIC(WMICContext *ctx) +W_UnFocusIC(WMView *view) { - XDestroyIC(ctx->xic); + if (view->xic) { + XUnsetICFocus(view->xic); + } +} +void +W_SetPreeditPositon(W_View *view, int x, int y) +{ + WMScreen *scr = W_VIEW_SCREEN(view); + XVaNestedList preedit_attr = NULL; + + if (view->xic && (scr->imctx->ximstyle & XIMPreeditPosition)) { + XPoint spot; + int ofs; + + ofs = (view->size.height - WMFontHeight(scr->normalFont))/2; + spot.x = x; + spot.y = y + view->size.height - ofs - 3; + preedit_attr = XVaCreateNestedList(0, XNSpotLocation, &spot, NULL); + XSetICValues(view->xic, XNPreeditAttributes, preedit_attr, NULL); + if (preedit_attr) { + XFree(preedit_attr); + } + } } int -W_LookupString(WMView *view, XKeyEvent *event, - char buffer, int bufsize, KeySym ksym) +W_LookupString(W_View *view, XKeyPressedEvent *event, char *buffer, int buflen, + KeySym *keysym, Status *status) { + WMScreen *scr = W_VIEW_SCREEN(view); -} + XSetInputFocus(scr->display, view->window, RevertToParent, CurrentTime); + if (view->xic) { +#ifdef X_HAVE_UTF8_STRING + return Xutf8LookupString(view->xic, event, buffer, buflen, keysym, status); +#else + return XLookupString(event, buffer, buflen, keysym, (XComposeStatus *)status); +#endif + } else { + return XLookupString(event, buffer, buflen, keysym, (XComposeStatus *)status); + } +} diff -Naur WindowMaker-0.91.0/WINGs/wmisc.c wm/WINGs/wmisc.c --- WindowMaker-0.91.0/WINGs/wmisc.c 2004-10-12 22:37:19 +0400 +++ wm/WINGs/wmisc.c 2004-11-06 23:20:05 +0300 @@ -107,7 +107,7 @@ int i, w, beforecrlf, word1, word2; /* text length before first cr/lf */ - beforecrlf = strcspn(text, "\n\r"); + beforecrlf = strcspn(text, "\n"); if (!wrap || beforecrlf==0) return beforecrlf; @@ -180,7 +180,7 @@ i = j; } } else { - i = strcspn(text, "\n\r"); + i = strcspn(text, "\n"); } return i; } diff -Naur WindowMaker-0.91.0/WINGs/wscroller.c wm/WINGs/wscroller.c --- WindowMaker-0.91.0/WINGs/wscroller.c 2004-10-12 22:41:45 +0400 +++ wm/WINGs/wscroller.c 2004-10-28 08:17:18 +0400 @@ -672,6 +672,8 @@ handleMotion(sPtr, pushX, pushY); */ break; + case WSDecrementWheel: + case WSIncrementWheel: case WSKnobSlot: case WSNoPart: /* dummy */ diff -Naur WindowMaker-0.91.0/WINGs/wtext.c wm/WINGs/wtext.c --- WindowMaker-0.91.0/WINGs/wtext.c 2004-10-23 06:45:11 +0400 +++ wm/WINGs/wtext.c 2004-10-28 08:17:18 +0400 @@ -2299,6 +2299,7 @@ } +# if 0 static void fontChanged(void *observerData, WMNotification *notification) { @@ -2312,6 +2313,7 @@ if (tPtr->flags.ownsSelection) WMSetTextSelectionFont(tPtr, font); } +#endif static void diff -Naur WindowMaker-0.91.0/WINGs/wtextfield.c wm/WINGs/wtextfield.c --- WindowMaker-0.91.0/WINGs/wtextfield.c 2004-10-12 22:45:48 +0400 +++ wm/WINGs/wtextfield.c 2004-10-28 08:17:19 +0400 @@ -71,7 +71,7 @@ unsigned int waitingSelection:1; /* requested selection, but * didnt get yet */ - /**/ + unsigned int notIllegalMovement:1; } flags; } TextField; @@ -312,6 +312,13 @@ } +static void +realizeObserver(void *self, WMNotification *not) +{ + W_CreateIC(((TextField*)self)->view); +} + + WMTextField* WMCreateTextField(WMWidget *parent) { @@ -364,6 +371,8 @@ WMSelectionOwnerDidChangeNotification, (void*)XA_PRIMARY); + WMAddNotificationObserver(realizeObserver, tPtr, + WMViewRealizedNotification, tPtr->view); tPtr->flags.cursorOn = 1; @@ -762,8 +771,11 @@ cx, tPtr->offsetWidth, cx, tPtr->view->size.height - tPtr->offsetWidth - 1); - if (tPtr->flags.secure) + W_SetPreeditPositon(tPtr->view, cx, 0); + + if (tPtr->flags.secure) { wfree(text); + } } @@ -953,9 +965,9 @@ CHECK_CLASS(data, WC_TextField); - switch (event->type) { case FocusIn: + W_FocusIC(tPtr->view); if (W_FocusedViewOfToplevel(W_TopLevelOfView(tPtr->view))!=tPtr->view) return; tPtr->flags.focused = 1; @@ -973,6 +985,7 @@ break; case FocusOut: + W_UnFocusIC(tPtr->view); tPtr->flags.focused = 0; #if 0 if (tPtr->timerID) @@ -1021,7 +1034,8 @@ controled = (event->xkey.state & ControlMask ? True : False); modified = shifted || controled; - count = XLookupString(&event->xkey, buffer, 63, &ksym, NULL); + count = W_LookupString(tPtr->view, &event->xkey, buffer, 63, &ksym, NULL); + //count = XLookupString(&event->xkey, buffer, 63, &ksym, NULL); buffer[count] = '\0'; switch (ksym) { @@ -1613,6 +1627,8 @@ WMDeleteTimerHandler(tPtr->timerID); #endif + W_DestroyIC(tPtr->view); + WMReleaseFont(tPtr->font); /*// use lostSelection() instead of WMDeleteSelectionHandler here?*/ WMDeleteSelectionHandler(tPtr->view, XA_PRIMARY, CurrentTime); diff -Naur WindowMaker-0.91.0/WINGs/wview.c wm/WINGs/wview.c --- WindowMaker-0.91.0/WINGs/wview.c 2004-10-12 22:46:16 +0400 +++ wm/WINGs/wview.c 2004-10-28 08:17:19 +0400 @@ -130,6 +130,8 @@ adoptChildView(parent, view); } + view->xic = 0; + view->refCount = 1; view->eventHandlers = WMCreateArrayWithDestructor(4, wfree); @@ -213,7 +215,6 @@ assert(view->size.width > 0); assert(view->size.height > 0); - if (view->parent && !view->parent->flags.realized) { wwarning("trying to realize widget of unrealized parent"); return; diff -Naur WindowMaker-0.91.0/wmlib/CVS/Entries wm/wmlib/CVS/Entries --- WindowMaker-0.91.0/wmlib/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/wmlib/CVS/Entries 2005-05-17 22:43:30 +0400 @@ -0,0 +1,11 @@ +/.cvsignore/1.5/Fri Apr 18 01:16:51 2003// +/COPYING.LIB/1.1.1.1/Tue Sep 29 22:36:36 1998// +/Makefile.am/1.4/Fri Apr 18 01:15:08 2003// +/WMaker.h/1.9/Tue Oct 12 21:28:29 2004// +/app.c/1.8/Tue Oct 12 21:28:29 2004// +/app.h/1.4/Tue Oct 12 21:28:29 2004// +/command.c/1.4/Tue Oct 12 21:28:29 2004// +/event.c/1.4/Tue Oct 12 21:28:29 2004// +/menu.c/1.4/Tue Oct 12 21:28:29 2004// +/menu.h/1.4/Tue Oct 12 21:28:29 2004// +D diff -Naur WindowMaker-0.91.0/wmlib/CVS/Repository wm/wmlib/CVS/Repository --- WindowMaker-0.91.0/wmlib/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/wmlib/CVS/Repository 2005-05-17 22:43:30 +0400 @@ -0,0 +1 @@ +wm/wmlib diff -Naur WindowMaker-0.91.0/wmlib/CVS/Root wm/wmlib/CVS/Root --- WindowMaker-0.91.0/wmlib/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/wmlib/CVS/Root 2005-05-17 22:43:30 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/wmlib/.cvsignore wm/wmlib/.cvsignore --- WindowMaker-0.91.0/wmlib/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/wmlib/.cvsignore 2003-04-18 05:16:51 +0400 @@ -0,0 +1,3 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt +.libs *.pc diff -Naur WindowMaker-0.91.0/wmlib/Makefile.in wm/wmlib/Makefile.in --- WindowMaker-0.91.0/wmlib/Makefile.in 2004-10-26 08:10:46 +0400 +++ wm/wmlib/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,401 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -AUTOMAKE_OPTIONS = no-dependencies - -lib_LIBRARIES = libWMaker.a - -include_HEADERS = WMaker.h - -INCLUDES = $(DFLAGS) @XCFLAGS@ - -libWMaker_a_SOURCES = menu.c app.c event.c command.c app.h menu.h - - -DISTCLEANFILES = wmlib.pc -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../src/config.h -CONFIG_CLEAN_FILES = -LIBRARIES = $(lib_LIBRARIES) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I../src -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -libWMaker_a_LIBADD = -libWMaker_a_OBJECTS = menu.$(OBJEXT) app.$(OBJEXT) event.$(OBJEXT) \ -command.$(OBJEXT) -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -HEADERS = $(include_HEADERS) - -DIST_COMMON = COPYING.LIB Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = $(libWMaker_a_SOURCES) -OBJECTS = $(libWMaker_a_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps wmlib/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-libLIBRARIES: - -clean-libLIBRARIES: - -test -z "$(lib_LIBRARIES)" || rm -f $(lib_LIBRARIES) - -distclean-libLIBRARIES: - -maintainer-clean-libLIBRARIES: - -install-libLIBRARIES: $(lib_LIBRARIES) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/$$p; \ - else :; fi; \ - done - @$(POST_INSTALL) - @list='$(lib_LIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(RANLIB) $(DESTDIR)$(libdir)/$$p"; \ - $(RANLIB) $(DESTDIR)$(libdir)/$$p; \ - else :; fi; \ - done - -uninstall-libLIBRARIES: - @$(NORMAL_UNINSTALL) - list='$(lib_LIBRARIES)'; for p in $$list; do \ - rm -f $(DESTDIR)$(libdir)/$$p; \ - done - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -libWMaker.a: $(libWMaker_a_OBJECTS) $(libWMaker_a_DEPENDENCIES) - -rm -f libWMaker.a - $(AR) cru libWMaker.a $(libWMaker_a_OBJECTS) $(libWMaker_a_LIBADD) - $(RANLIB) libWMaker.a - -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir) - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \ - done - -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/$$p; \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = wmlib - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: install-libLIBRARIES install-exec-local -install-exec: install-exec-am - -install-data-am: install-includeHEADERS -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-libLIBRARIES uninstall-includeHEADERS -uninstall: uninstall-am -all-am: Makefile $(LIBRARIES) $(HEADERS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-libLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ - mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-libLIBRARIES clean-compile clean-libtool clean-tags \ - clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-libLIBRARIES distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-libLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-libLIBRARIES distclean-libLIBRARIES \ -clean-libLIBRARIES maintainer-clean-libLIBRARIES uninstall-libLIBRARIES \ -install-libLIBRARIES mostlyclean-compile distclean-compile \ -clean-compile maintainer-clean-compile mostlyclean-libtool \ -distclean-libtool clean-libtool maintainer-clean-libtool \ -uninstall-includeHEADERS install-includeHEADERS tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-local install-exec-am install-exec install-data-am \ -install-data install-am install uninstall-am uninstall all-redirect \ -all-am all installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean - - -install-exec-local: - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig - @list='wmlib.pc'; for p in $$list; do \ - if test -f $$p; then \ - echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \ - else :; fi; \ - done - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WPrefs.app/Appearance.c wm/WPrefs.app/Appearance.c --- WindowMaker-0.91.0/WPrefs.app/Appearance.c 2004-10-13 00:08:56 +0400 +++ wm/WPrefs.app/Appearance.c 2005-03-12 01:57:40 +0300 @@ -1726,7 +1726,7 @@ char *tmp; Bool ok = True; - panel->fprefix = wstrconcat(wusergnusteppath(), "/.AppInfo"); + panel->fprefix = wstrconcat(wusergnusteppath(), "/Library/WindowMaker"); if (access(panel->fprefix, F_OK)!=0) { if (mkdir(panel->fprefix, 0755) < 0) { diff -Naur WindowMaker-0.91.0/WPrefs.app/CVS/Entries wm/WPrefs.app/CVS/Entries --- WindowMaker-0.91.0/WPrefs.app/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/CVS/Entries 2005-05-17 22:43:13 +0400 @@ -0,0 +1,35 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:06 2003// +/Appearance.c/1.60/Fri Mar 11 22:57:40 2005// +/Configurations.c/1.17/Sat Oct 23 03:30:04 2004// +/Expert.c/1.25/Sat Oct 23 03:30:04 2004// +/Focus.c/1.17/Fri Oct 22 00:21:52 2004// +/Font.c/1.16/Tue Oct 12 21:28:28 2004// +/FontSimple.c/1.15/Tue Oct 26 12:04:18 2004// +/Icons.c/1.14/Tue Oct 12 21:28:28 2004// +/KeyboardSettings.c/1.9/Tue Oct 12 21:28:28 2004// +/KeyboardShortcuts.c/1.25/Tue Oct 12 21:28:28 2004// +/Makefile.am/1.27/Mon Nov 1 00:50:19 2004// +/Menu.c/1.47/Tue Oct 26 03:40:44 2004// +/MenuPreferences.c/1.14/Tue Oct 12 21:28:28 2004// +/MouseSettings.c/1.30/Tue Oct 12 21:28:28 2004// +/Paths.c/1.23/Tue Oct 12 21:28:28 2004// +/Preferences.c/1.21/Tue Oct 12 21:28:28 2004// +/README/1.7/Sun Oct 24 03:20:29 2004// +/TexturePanel.c/1.31/Tue Oct 12 21:28:28 2004// +/TexturePanel.h/1.6/Tue Oct 12 21:28:28 2004// +/Themes.c/1.8/Tue Oct 12 21:28:28 2004// +/WPrefs.c/1.47/Sat Oct 23 21:07:14 2004// +/WPrefs.h/1.35/Tue Oct 19 02:37:58 2004// +/WPrefs.tiff/1.8/Sun Oct 24 03:20:29 2004// +/WPrefs.xpm/1.8/Sun Oct 24 03:20:29 2004// +/WindowHandling.c/1.20/Tue Oct 12 21:28:28 2004// +/Workspace.c/1.19/Tue Oct 12 21:28:28 2004// +/double.c/1.7/Tue Oct 12 21:28:28 2004// +/double.h/1.2/Tue Oct 12 21:28:28 2004// +/editmenu.c/1.24/Sun Feb 20 04:36:57 2005// +/editmenu.h/1.11/Tue Oct 12 21:28:28 2004// +/imagebrowser.c/1.6/Tue Oct 12 21:28:28 2004// +/imagebrowser.h/1.2/Tue Oct 12 21:28:28 2004// +/main.c/1.15/Tue Oct 19 02:37:58 2004// +/xmodifier.c/1.4/Tue Oct 12 21:28:28 2004// +D diff -Naur WindowMaker-0.91.0/WPrefs.app/CVS/Entries.Log wm/WPrefs.app/CVS/Entries.Log --- WindowMaker-0.91.0/WPrefs.app/CVS/Entries.Log 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/CVS/Entries.Log 2005-05-17 22:43:16 +0400 @@ -0,0 +1,3 @@ +A D/po//// +A D/tiff//// +A D/xpm//// diff -Naur WindowMaker-0.91.0/WPrefs.app/CVS/Repository wm/WPrefs.app/CVS/Repository --- WindowMaker-0.91.0/WPrefs.app/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/CVS/Repository 2005-05-17 22:43:13 +0400 @@ -0,0 +1 @@ +wm/WPrefs.app diff -Naur WindowMaker-0.91.0/WPrefs.app/CVS/Root wm/WPrefs.app/CVS/Root --- WindowMaker-0.91.0/WPrefs.app/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/CVS/Root 2005-05-17 22:43:12 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WPrefs.app/.cvsignore wm/WPrefs.app/.cvsignore --- WindowMaker-0.91.0/WPrefs.app/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/.cvsignore 2003-04-02 15:37:06 +0400 @@ -0,0 +1,4 @@ +Makefile Makefile.in +WPrefs +.libs +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WPrefs.app/editmenu.c wm/WPrefs.app/editmenu.c --- WindowMaker-0.91.0/WPrefs.app/editmenu.c 2004-10-13 00:52:43 +0400 +++ wm/WPrefs.app/editmenu.c 2005-02-20 07:36:57 +0300 @@ -1516,17 +1516,8 @@ static void destroyEditMenu(WEditMenu *mPtr) { - WEditMenuItem *item; - WMArrayIterator iter; - WMRemoveNotificationObserver(mPtr); - WM_ITERATE_ARRAY(mPtr->items, item, iter) { - if (item->submenu) { - WMDestroyWidget(item->submenu); - } - } - WMFreeArray(mPtr->items); wfree(mPtr->tdelegate); diff -Naur WindowMaker-0.91.0/WPrefs.app/Font.c wm/WPrefs.app/Font.c --- WindowMaker-0.91.0/WPrefs.app/Font.c 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/Font.c 2004-10-13 01:28:28 +0400 @@ -0,0 +1,2100 @@ +/* Font.c- text/font settings + * + * WPrefs - Window Maker Preferences Program + * + * Copyright (c) 1999-2003 Alfredo K. Kojima + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + * USA. + */ + + +#include "WPrefs.h" +#include +#include + +typedef struct _Panel { + WMBox *box; + char *sectionName; + + char *description; + + CallbackRec callbacks; + + WMWidget *parent; + + + WMLabel *prevL; + + WMFontPanel *fontPanel; + + WMPopUpButton *fontSel; + WMFrame *multiF; + WMButton *togMulti; + WMFrame *langF; + WMPopUpButton *langP; + WMFrame *aaF; + WMButton *togAA; + + /* single byte */ + WMTextField *fontT; + WMButton *changeB; + + /* multibyte */ + WMLabel *fsetL; + WMList *fsetLs; + + WMButton *addB; + WMButton *editB; + WMButton *remB; + + WMButton *upB; + WMButton *downB; + + WMColor *white; + WMColor *black; + WMColor *light; + WMColor *dark; + + WMColor *back; + WMColor *colors[9]; + + Pixmap preview; + WMPixmap *previewPix; + WMPixmap *hand; + WMPixmap *up_arrow; + WMPixmap *down_arrow; + WMPixmap *alt_up_arrow; + WMPixmap *alt_down_arrow; + + int oldsection; + char menuStyle; + char titleAlignment; + Bool MultiByteText; + + Bool AntialiasedText; +} _Panel; + + + +#define ICON_FILE "fonts" + +static WMRect previewPositions[] = { +#define WINTITLE 0 + {{30, 10},{190, 20}}, +#define DISTITLE 1 + {{30, 35},{90, 64}}, +#define PMTITLE 2 + {{30, 105},{90, 20}}, +#define PMITEM 3 + {{30, 125},{90, 20*4}}, +#define PCLIP 4 + {{156, 35},{64, 64}}, +#define PICON 5 + {{156, 105},{64, 64}} +}; +#define EVERYTHING 0xff + +static char *colorOptions[] = { +#define FTITLE (1<<0) + "FTitleColor", "white", +#define DISCOL (1<<1) /* Display uses white always */ +#define MTITLE (1<<2) + "MenuTitleColor", "white", +#define MITEM (1<<3) + "MenuTextColor", "black", +#define CLIP (1<<4) + "ClipTitleColor", "black", +#define CCLIP (1<<4) + "ClipTitleColor", "#454045", +#define ICONT (1<<5) + "IconTitleColor", "white", +#define ICONB (1<<5) + "IconTitleBack", "black" +}; + +#define MSTYLE_NORMAL 0 +#define MSTYLE_SINGLE 1 +#define MSTYLE_FLAT 2 + + +#define RESIZEBAR_BEVEL -1 +#define MENU_BEVEL -2 +#define CLIP_BUTTON_SIZE 23 +#define ICON_SIZE 64 + + +static char *textureOptions[] = { + "FTitleBack", + NULL, + "MenuTitleBack", + "MenuTextBack", + "IconBack", + "IconBack" +}; + +/* XPM */ +static char * hand_xpm[] = { + "22 21 19 1", + " c None", + ". c #030305", + "+ c #7F7F7E", + "@ c #B5B5B6", + "# c #C5C5C6", + "$ c #969697", + "% c #FDFDFB", + "& c #F2F2F4", + "* c #E5E5E4", + "= c #ECECEC", + "- c #DCDCDC", + "; c #D2D2D0", + "> c #101010", + ", c #767674", + "' c #676767", + ") c #535355", + "! c #323234", + "~ c #3E3C56", + "{ c #333147", + " ", + " ..... ", + " ..+@##$. ", + " .%%%&@.......... ", + " .%*%%&#%%%%%%%%%$. ", + " .*#%%%%%%%%%&&&&==. ", + " .-%%%%%%%%%=*-;;;#$. ", + " .-%%%%%%%%&..>..... ", + " >-%%%%%%%%%*#+. ", + " >-%%%%%%%%%*@,. ", + " >#%%%%%%%%%*@'. ", + " >$&&%%%%%%=... ", + " .+@@;=&%%&;$,> ", + " .',$@####$+). ", + " .!',+$++,'. ", + " ..>>>>>. ", + " ", + " ~~{{{~~ ", + " {{{{{{{{{{{ ", + " ~~{{{~~ ", + " "}; + +static char *up_arrow_xpm[] = { + "9 9 3 1", + ". c #acaaac", + "% c #525552", + "# c #000000", + "....%....", + "....#....", + "...%#%...", + "...###...", + "..%###%..", + "..#####..", + ".%#####%.", + ".#######.", + "%#######%" +}; + +static char *down_arrow_xpm[] = { + "9 9 3 1", + ". c #acaaac", + "% c #525552", + "# c #000000", + "%#######%", + ".#######.", + ".%#####%.", + "..#####..", + "..%###%..", + "...###...", + "...%#%...", + "....#....", + "....%...." +}; + +static char *alt_up_arrow_xpm[] = { + "9 9 2 1", + ". c #ffffff", + "% c #525552", + "....%....", + "....%....", + "...%%%...", + "...%%%...", + "..%%%%%..", + "..%%%%%..", + ".%%%%%%%.", + ".%%%%%%%.", + "%%%%%%%%%" +}; + +static char *alt_down_arrow_xpm[] = { + "9 9 2 1", + ". c #ffffff", + "% c #525552", + "%%%%%%%%%", + ".%%%%%%%.", + ".%%%%%%%.", + "..%%%%%..", + "..%%%%%..", + "...%%%...", + "...%%%...", + "....%....", + "....%...." +}; +/* XPM */ + +static WMPropList *CurrentFontArray = NULL; +//static WMPropList *CurrentMenuTitleFont = NULL; +//static WMPropList *CurrentMenuTextFont = NULL; +//static WMPropList *CurrentIconTitleFont = NULL; +//static WMPropList *CurrentClipTitleFont = NULL; +//static WMPropList *CurrentLargeDisplayFont = NULL; + +static WMPropList *DefaultWindowTitleFont = NULL; +static WMPropList *DefaultMenuTitleFont = NULL; +static WMPropList *DefaultMenuTextFont = NULL; +static WMPropList *DefaultIconTitleFont = NULL; +static WMPropList *DefaultClipTitleFont = NULL; +static WMPropList *DefaultLargeDisplayFont = NULL; + +static void changePage(WMWidget *w, void *data); +static void setLanguageType(void *data, Bool multiByte); +static void refillFontSetList(void *data); +static void readFontEncodings(void *data); +static void changeLanguageAction(WMWidget *w, void *data); +static void checkListForArrows(void *data); + +static char* getFontEncoding(void *data); +static char* getFontSampleString(void *data); + +/* note single element */ +static WMFont* getFontForPreview(void *data, int element); +static WMFont* getDefaultSystemFont(void *data, int element); + +static WMPropList* getDefaultFontProp(void *data, char *encoding, int section); +static WMPropList* getCurrentFontProp(void *data, int section); + +static Bool isEncodingMultiByte(void *data); + +static void +str2rcolor(RContext *rc, char *name, RColor *color) +{ + XColor xcolor; + + XParseColor(rc->dpy, rc->cmap, name, &xcolor); + + color->alpha = 255; + color->red = xcolor.red >> 8; + color->green = xcolor.green >> 8; + color->blue = xcolor.blue >> 8; +} + +static void +drawMenuBevel(RImage *img) +{ + RColor light, dark, mid; + int i; + int iheight = img->height / 4; + + light.alpha = 0; + light.red = light.green = light.blue = 80; + + dark.alpha = 255; + dark.red = dark.green = dark.blue = 0; + + mid.alpha = 0; + mid.red = mid.green = mid.blue = 40; + + for (i = 1; i < 4; i++) { + ROperateLine(img, RSubtractOperation, 0, i*iheight-2, + img->width-1, i*iheight-2, &mid); + + RDrawLine(img, 0, i*iheight-1, img->width-1, i*iheight-1, &dark); + + ROperateLine(img, RAddOperation, 1, i*iheight, + img->width-2, i*iheight, &light); + } +} + +static void +paintTitle(WMScreen *scr, Drawable d, WMColor *color, WMFont *font, + int part, WMAlignment align, char *text) +{ + int l = strlen(text); + int x = previewPositions[part].pos.x; + int y = previewPositions[part].pos.y; + int w = previewPositions[part].size.width; + int h = previewPositions[part].size.height; + + switch (align) { + case WALeft: + x += 5; + break; + case WARight: + x += w - 5 - WMWidthOfString(font, text, l); + break; + default: + case WACenter: + x += (w - WMWidthOfString(font, text, l))/2; + break; + } + WMDrawString(scr, d, color, font, x, + y + (h - WMFontHeight(font))/2, text, l); +} + +static void +paintItems(WMScreen *scr, Drawable d, WMColor *color, WMFont *font, + int part, char *text) +{ + int l = strlen(text); + int x = previewPositions[part].pos.x; + int y = previewPositions[part].pos.y; + //int w = previewPositions[part].size.width; + int h = previewPositions[part].size.height/4; + int i; + for( i = 0; i < 4 ; i++) { + WMDrawString(scr, d, color, font, x+5, + y+(20*i)+(h - WMFontHeight(font))/2, text, l); + } +} + +static void +paintIcon(WMScreen *scr,Drawable d, WMColor *color, WMColor *Iback, + WMFont *font, int part, char *text) +{ + Display *dpy = WMScreenDisplay(scr); + int l = strlen(text); + int x = previewPositions[part].pos.x+1; + int y = previewPositions[part].pos.y+1; + int w = previewPositions[part].size.width-2; + int h = WMFontHeight(font)+2; + + XFillRectangle(dpy, d, WMColorGC(Iback), x, y, w, h); + x += (w - WMWidthOfString(font, text, l))/2; + WMDrawString(scr, d, color, font, x, + y + (h - WMFontHeight(font))/2, text, l); + +} + +static void +drawFonts(_Panel *panel, int elements) +{ + WMScreen *scr = WMWidgetScreen(panel->box); + WMPixmap *pixmap; + Pixmap d; + + pixmap = WMGetLabelImage(panel->prevL); + d = WMGetPixmapXID(pixmap); + + if(elements & FTITLE) { + paintTitle(scr, d, panel->colors[0], getFontForPreview(panel, WINTITLE), + WINTITLE, panel->titleAlignment, _("Window Title Font")); + } + if(elements & DISCOL) { + paintTitle(scr, d, panel->white, getFontForPreview(panel, DISTITLE), + DISTITLE, WACenter, _("Display")); + } + if(elements & MTITLE) { + paintTitle(scr, d, panel->colors[1], getFontForPreview(panel, PMTITLE), + PMTITLE, WALeft, _("Menu Title")); + } + if(elements & MITEM) { + paintItems(scr, d, panel->colors[2], getFontForPreview(panel, PMITEM), + PMITEM, _("Menu Item")); + } + if(elements & CLIP) { + WMDrawString(scr, d, panel->colors[4], + getFontForPreview(panel, PCLIP), 169,37, "1",1); + WMDrawString(scr, d, panel->colors[3], + getFontForPreview(panel, PCLIP),179, 84, _("Clip title"), 10); + } + if(elements & ICONT) { + paintIcon(scr, d, panel->colors[5], panel->colors[6], + getFontForPreview(panel, PICON), PICON, _("Icon Title")); + } +} + +static void +dumpRImage(char *path, RImage *image) +{ + FILE *f; + int channels = (image->format == RRGBAFormat ? 4 : 3); + + f = fopen(path, "w"); + if (!f) { + wsyserror(path); + return; + } + fprintf(f, "%02x%02x%1x", image->width, image->height, channels); + + fwrite(image->data, 1, image->width * image->height * channels, f); + + if (fclose(f) < 0) { + wsyserror(path); + } +} + +/*static int + isPixmap(WMPropList *prop) + { + WMPropList *p; + char *s; + + p = WMGetFromPLArray(prop, 0); + s = WMGetFromPLString(p); + if (strcasecmp(&s[1], "pixmap")==0) + return 1; + else + return 0; + }*/ + +static Pixmap +renderTexture(WMScreen *scr, WMPropList *texture, int width, int height, + char *path, int border) +{ + char *type; + RImage *image = NULL; + Pixmap pixmap; + RContext *rc = WMScreenRContext(scr); + char *str; + RColor rcolor; + + + type = WMGetFromPLString(WMGetFromPLArray(texture, 0)); + + if (strcasecmp(type, "solid")==0) { + + str = WMGetFromPLString(WMGetFromPLArray(texture, 1)); + + str2rcolor(rc, str, &rcolor); + + image = RCreateImage(width, height, False); + RClearImage(image, &rcolor); + } else if (strcasecmp(type, "igradient")==0) { + int t1, t2; + RColor c1[2], c2[2]; + + str = WMGetFromPLString(WMGetFromPLArray(texture, 1)); + str2rcolor(rc, str, &c1[0]); + str = WMGetFromPLString(WMGetFromPLArray(texture, 2)); + str2rcolor(rc, str, &c1[1]); + str = WMGetFromPLString(WMGetFromPLArray(texture, 3)); + t1 = atoi(str); + + str = WMGetFromPLString(WMGetFromPLArray(texture, 4)); + str2rcolor(rc, str, &c2[0]); + str = WMGetFromPLString(WMGetFromPLArray(texture, 5)); + str2rcolor(rc, str, &c2[1]); + str = WMGetFromPLString(WMGetFromPLArray(texture, 6)); + t2 = atoi(str); + + image = RRenderInterwovenGradient(width, height, c1, t1, c2, t2); + } else if (strcasecmp(&type[1], "gradient")==0) { + int style; + RColor rcolor2; + + switch (toupper(type[0])) { + case 'V': + style = RVerticalGradient; + break; + case 'H': + style = RHorizontalGradient; + break; + default: + case 'D': + style = RDiagonalGradient; + break; + } + + str = WMGetFromPLString(WMGetFromPLArray(texture, 1)); + str2rcolor(rc, str, &rcolor); + str = WMGetFromPLString(WMGetFromPLArray(texture, 2)); + str2rcolor(rc, str, &rcolor2); + + image = RRenderGradient(width, height, &rcolor, &rcolor2, style); + } else if (strcasecmp(&type[2], "gradient")==0 && toupper(type[0])=='T') { + int style; + RColor rcolor2; + int i; + RImage *grad, *timage; + char *path; + + switch (toupper(type[1])) { + case 'V': + style = RVerticalGradient; + break; + case 'H': + style = RHorizontalGradient; + break; + default: + case 'D': + style = RDiagonalGradient; + break; + } + + str = WMGetFromPLString(WMGetFromPLArray(texture, 3)); + str2rcolor(rc, str, &rcolor); + str = WMGetFromPLString(WMGetFromPLArray(texture, 4)); + str2rcolor(rc, str, &rcolor2); + + str = WMGetFromPLString(WMGetFromPLArray(texture, 1)); + + if ((path=wfindfileinarray(GetObjectForKey("PixmapPath"), str))!=NULL) + timage = RLoadImage(rc, path, 0); + + if (!path || !timage) { + wwarning("could not load file '%s': %s", path, + RMessageForError(RErrorCode)); + } else { + grad = RRenderGradient(width, height, &rcolor, &rcolor2, style); + + image = RMakeTiledImage(timage, width, height); + RReleaseImage(timage); + + i = atoi(WMGetFromPLString(WMGetFromPLArray(texture, 2))); + + RCombineImagesWithOpaqueness(image, grad, i); + RReleaseImage(grad); + } + } else if (strcasecmp(&type[2], "gradient")==0 && toupper(type[0])=='M') { + int style; + RColor **colors; + int i, j; + + switch (toupper(type[1])) { + case 'V': + style = RVerticalGradient; + break; + case 'H': + style = RHorizontalGradient; + break; + default: + case 'D': + style = RDiagonalGradient; + break; + } + + j = WMGetPropListItemCount(texture); + + if (j > 0) { + colors = wmalloc(j * sizeof(RColor*)); + + for (i = 2; i < j; i++) { + str = WMGetFromPLString(WMGetFromPLArray(texture, i)); + colors[i-2] = wmalloc(sizeof(RColor)); + str2rcolor(rc, str, colors[i-2]); + } + colors[i-2] = NULL; + + image = RRenderMultiGradient(width, height, colors, style); + + for (i = 0; colors[i]!=NULL; i++) + wfree(colors[i]); + wfree(colors); + } + } else if (strcasecmp(&type[1], "pixmap")==0) { + RImage *timage = NULL; + char *path; + RColor color; + + str = WMGetFromPLString(WMGetFromPLArray(texture, 1)); + + if ((path=wfindfileinarray(GetObjectForKey("PixmapPath"), str))!=NULL) + timage = RLoadImage(rc, path, 0); + + if (!path || !timage) { + wwarning("could not load file '%s': %s", path ? path : str, + RMessageForError(RErrorCode)); + } else { + str = WMGetFromPLString(WMGetFromPLArray(texture, 2)); + str2rcolor(rc, str, &color); + + switch (toupper(type[0])) { + case 'T': + image = RMakeTiledImage(timage, width, height); + RReleaseImage(timage); + timage = image; + break; + case 'C': + image = RMakeCenteredImage(timage, width, height, &color); + RReleaseImage(timage); + timage = image; + break; + case 'S': + case 'M': + image = RScaleImage(timage, width, height); + RReleaseImage(timage); + timage = image; + break; + } + + } + wfree(path); + } + + if (!image) + return None; + + if (path) { + dumpRImage(path, image); + } + + if (border < 0) { + if (border == MENU_BEVEL) { + drawMenuBevel(image); + RBevelImage(image, RBEV_RAISED2); + } + } else if (border) { + RBevelImage(image, border); + } + + RConvertImage(rc, image, &pixmap); + RReleaseImage(image); + + return pixmap; +} + +static Pixmap +renderMenu(_Panel *panel, WMPropList *texture, int width, int iheight) +{ + WMScreen *scr = WMWidgetScreen(panel->parent); + Display *dpy = WMScreenDisplay(scr); + Pixmap pix, tmp; + //RContext *rc = WMScreenRContext(scr); + GC gc = XCreateGC(dpy, WMWidgetXID(panel->parent), 0, NULL); + int i; + + switch (panel->menuStyle) { + case MSTYLE_NORMAL: + tmp = renderTexture(scr, texture, width, iheight, NULL, RBEV_RAISED2); + + pix = XCreatePixmap(dpy, tmp, width, iheight*4, WMScreenDepth(scr)); + for (i = 0; i < 4; i++) { + XCopyArea(dpy, tmp, pix, gc, 0, 0, width, iheight, 0, iheight*i); + } + XFreePixmap(dpy, tmp); + break; + case MSTYLE_SINGLE: + pix = renderTexture(scr, texture, width, iheight*4, NULL, MENU_BEVEL); + break; + case MSTYLE_FLAT: + pix = renderTexture(scr, texture, width, iheight*4, NULL, RBEV_RAISED2); + break; + } + XFreeGC(dpy, gc); + + return pix; +} + +static void +renderClip(_Panel *panel, GC gc, int part, int relief) +{ + WMScreen *scr = WMWidgetScreen(panel->box); + Display *dpy = WMScreenDisplay(scr); + RContext *rc = WMScreenRContext(scr); + WMPropList *prop; + Pixmap pix; + XImage *original; + XPoint p[4]; + RImage *tile; + RColor black; + RColor dark; + RColor light; + int pt, tp; + int as; + + prop = GetObjectForKey(textureOptions[part]); + + pix = renderTexture(scr, prop, + previewPositions[part].size.width, + previewPositions[part].size.height, + NULL, relief); + + + original = XGetImage(dpy, pix, 0, 0, 64, 64, + AllPlanes, ZPixmap); + if (!original){ + wwarning(_("error capturing \"original\" tile image"), + RMessageForError(RErrorCode)); + } + tile = RCreateImageFromXImage(rc, original, NULL); + + XDestroyImage(original); + XFreePixmap(WMScreenDisplay(scr), pix); + + pt = CLIP_BUTTON_SIZE*ICON_SIZE/64; + tp = ICON_SIZE-1 - pt; + as = pt - 15; + + black.alpha = 255; + black.red = black.green = black.blue = 0; + + dark.alpha = 0; + dark.red = dark.green = dark.blue = 60; + + light.alpha = 0; + light.red = light.green = light.blue = 80; + + + /* top right */ + ROperateLine(tile, RSubtractOperation, tp, 0, ICON_SIZE-2, + pt-1, &dark); + RDrawLine(tile, tp-1, 0, ICON_SIZE-1, pt+1, &black); + ROperateLine(tile, RAddOperation, tp, 2, ICON_SIZE-3, + pt, &light); + + /* arrow bevel */ + ROperateLine(tile, RSubtractOperation, ICON_SIZE - 7 - as, 4, + ICON_SIZE - 5, 4, &dark); + ROperateLine(tile, RSubtractOperation, ICON_SIZE - 6 - as, 5, + ICON_SIZE - 5, 6 + as, &dark); + ROperateLine(tile, RAddOperation, ICON_SIZE - 5, 4, ICON_SIZE - 5, 6 + as, + &light); + + /* bottom left */ + ROperateLine(tile, RAddOperation, 2, tp+2, pt-2, + ICON_SIZE-3, &dark); + RDrawLine(tile, 0, tp-1, pt+1, ICON_SIZE-1, &black); + ROperateLine(tile, RSubtractOperation, 0, tp-2, pt+1, + ICON_SIZE-2, &light); + + /* arrow bevel */ + ROperateLine(tile, RSubtractOperation, 4, ICON_SIZE - 7 - as, 4, + ICON_SIZE - 5, &dark); + ROperateLine(tile, RSubtractOperation, 5, ICON_SIZE - 6 - as, + 6 + as, ICON_SIZE - 5, &dark); + ROperateLine(tile, RAddOperation, 4, ICON_SIZE - 5, 6 + as, ICON_SIZE - 5, + &light); + + RConvertImage(rc, tile, &pix); + + /* top right arrow */ + p[0].x = p[3].x = ICON_SIZE-5-as; + p[0].y = p[3].y = 5; + p[1].x = ICON_SIZE-6; + p[1].y = 5; + p[2].x = ICON_SIZE-6; + p[2].y = 4+as; + XFillPolygon(dpy, pix, WMColorGC(panel->colors[4]), p, 3, Convex, CoordModeOrigin); + XDrawLines(dpy, pix, WMColorGC(panel->colors[4]), p, 4, CoordModeOrigin); + + /* bottom left arrow */ + p[0].x = p[3].x = 5; + p[0].y = p[3].y = ICON_SIZE-5-as; + p[1].x = 5; + p[1].y = ICON_SIZE-6; + p[2].x = 4+as; + p[2].y = ICON_SIZE-6; + XFillPolygon(dpy, pix, WMColorGC(panel->colors[4]), p, 3, Convex, CoordModeOrigin); + XDrawLines(dpy, pix, WMColorGC(panel->colors[4]), p, 4, CoordModeOrigin); + + XCopyArea(dpy, pix, panel->preview, gc, 0, 0, + previewPositions[part].size.width, + previewPositions[part].size.height, + previewPositions[part].pos.x, + previewPositions[part].pos.y); + + RReleaseImage(tile); + XFreePixmap(WMScreenDisplay(scr), pix); +} + +static void +renderPreview(_Panel *panel, GC gc, int part, int relief) +{ + WMPropList *prop; + Pixmap pix; + WMScreen *scr = WMWidgetScreen(panel->box); + + prop = GetObjectForKey(textureOptions[part]); + + pix = renderTexture(scr, prop, + previewPositions[part].size.width, + previewPositions[part].size.height, + NULL, relief); + XCopyArea(WMScreenDisplay(scr), pix, + panel->preview, gc, 0, 0, + previewPositions[part].size.width, + previewPositions[part].size.height, + previewPositions[part].pos.x, + previewPositions[part].pos.y); + + XFreePixmap(WMScreenDisplay(scr), pix); +} + +static void +paintPreviewBox(Panel *panel, int elements) +{ + WMScreen *scr = WMWidgetScreen(panel->parent); + Display *dpy = WMScreenDisplay(scr); + //int refresh = 0; + GC gc; + WMColor *black = WMBlackColor(scr); + Pixmap mitem; + + gc = XCreateGC(dpy, WMWidgetXID(panel->parent), 0, NULL); + + if (panel->preview == None) { + WMPixmap *pix; + + panel->preview = XCreatePixmap(dpy, WMWidgetXID(panel->parent), + 240-4, 190-4, WMScreenDepth(scr)); + + pix = WMCreatePixmapFromXPixmaps(scr, panel->preview, None, + 240-4, 190-4, WMScreenDepth(scr)); + + WMSetLabelImage(panel->prevL, pix); + WMReleasePixmap(pix); + } + XFillRectangle(dpy, panel->preview, WMColorGC(panel->back), + 0, 0, 240-4, 190-4); + + if (elements & (1<preview, WMColorGC(black), + previewPositions[WINTITLE].pos.x-1, + previewPositions[WINTITLE].pos.y-1, + previewPositions[WINTITLE].size.width, + previewPositions[WINTITLE].size.height); + } + if (elements & (1<preview, WMColorGC(panel->back), + previewPositions[DISTITLE].pos.x-1, + previewPositions[DISTITLE].pos.y-1, + previewPositions[DISTITLE].size.width, + previewPositions[DISTITLE].size.height); + } + if (elements & (1<preview, WMColorGC(black), + previewPositions[PMTITLE].pos.x-1, + previewPositions[PMTITLE].pos.y-1, + previewPositions[PMTITLE].size.width, + previewPositions[PMTITLE].size.height); + } + if (elements & (1<preview, gc, 0, 0, + previewPositions[PMITEM].size.width, + previewPositions[PMITEM].size.height, + previewPositions[PMITEM].pos.x, + previewPositions[PMITEM].pos.y); + + XFreePixmap(dpy, mitem); + } + if (elements & (1<preview, gc, 29, 125, 29, 125+20*4+25); + XDrawLine(dpy, panel->preview, gc, 119, 125, 119, 125+20*4+25); + } + if (elements & (1<preview, WMColorGC(black), + previewPositions[PCLIP].pos.x-1, + previewPositions[PCLIP].pos.y-1, + previewPositions[PCLIP].size.width, + previewPositions[PCLIP].size.height); + } + if (elements & (1<preview, WMColorGC(black), + previewPositions[PICON].pos.x-1, + previewPositions[PICON].pos.y-1, + previewPositions[PICON].size.width, + previewPositions[PICON].size.height); + } + drawFonts(panel, elements); + WMRedisplayWidget(panel->prevL); + XFreeGC(dpy, gc); + WMReleaseColor(black); +} + +static void +paintTextField(void *data, int section) +{ + _Panel *panel = (_Panel*)data; + //char *sample = NULL; + int encoding; + encoding = WMGetPopUpButtonSelectedItem(panel->langP); + WMSetTextFieldFont(panel->fontT, getFontForPreview(panel, section)); + switch(encoding) { + case 0: /* Current Font in theme */ + WMSetTextFieldText(panel->fontT, + "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz0123456789\x00e0\x00e6\x00e7\x00eb\x00ee\x00f0\x00f1\x00f3\x00f9\x00fd\x00c0\x00c6\x00c7\x00cb\x00ce\x00d0\x00d1\x00d3\x00d9\x00dd"); + break; + case 1: /* default */ + WMSetTextFieldText(panel->fontT, getFontSampleString(panel)); + // "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz0123456789\x00e0\x00e6\x00e7\x00eb\x00ee\x00f0\x00f1\x00f3\x00f9\x00fd\x00c0\x00c6\x00c7\x00cb\x00ce\x00d0\x00d1\x00d3\x00d9\x00dd"); + break; + case 2: /* latin1 iso8859-1 */ + WMSetTextFieldText(panel->fontT, getFontSampleString(panel)); + // "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz0123456789\x00e0\x00e6\x00e7\x00eb\x00ee\x00f0\x00f1\x00f3\x00f9\x00fd\x00c0\x00c6\x00c7\x00cb\x00ce\x00d0\x00d1\x00d3\x00d9\x00dd"); + break; + case 3: /* latin2 iso8859-2 */ + WMSetTextFieldText(panel->fontT, getFontSampleString(panel)); + // "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz0123456789\x00e0\x00e6\x00e7\x00eb\x00ee\x00f0\x00f1\x00f3\x00f9\x00fd\x00c0\x00c6\x00c7\x00cb\x00ce\x00d0\x00d1\x00d3\x00d9\x00dd"); + break; + case 4: /* Greek iso8859-7 */ + WMSetTextFieldText(panel->fontT, getFontSampleString(panel)); + // "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz0123456789\x00e0\x00e6\x00e7\x00eb\x00ee\x00f0\x00f1\x00f3\x00f9\x00fd\x00c0\x00c6\x00c7\x00cb\x00ce\x00d0\x00d1\x00d3\x00d9\x00dd"); + break; + /* luckily all these happen to have the MultiByte chars in the same places */ + case 5: /* Japanese jisx0208.1983 */ + WMSetTextFieldText(panel->fontT, getFontSampleString(panel)); + // "Window Maker 桼ƥƥ"); + break; + case 6: /* Korean ksc5601.1987 */ + WMSetTextFieldText(panel->fontT, getFontSampleString(panel)); + // " Ŀ "); + break; + case 7: /* korean2 daewoo */ + WMSetTextFieldText(panel->fontT, getFontSampleString(panel)); + // " Ŀ "); + break; + case 8: /* Russian koi8-r */ + WMSetTextFieldText(panel->fontT, getFontSampleString(panel)); + // " Window Maker"); + break; + case 9: /* Ukranian koi8-u */ + WMSetTextFieldText(panel->fontT, getFontSampleString(panel)); + // "ABCDEFGHIKLMNOPQRSTUVXYWZabcdefghiklmnopqrstuvxywz0123456789\x00e0\x00e6\x00e7\x00eb\x00ee\x00f0\x00f1\x00f3\x00f9\x00fd\x00c0\x00c6\x00c7\x00cb\x00ce\x00d0\x00d1\x00d3\x00d9\x00dd"); + break; + } +} + +static void +previewClick(XEvent *event, void *clientData) +{ + _Panel *panel = (_Panel*)clientData; + int i; + + for (i = 0; i < sizeof(previewPositions)/sizeof(WMRect); i++) { + if (event->xbutton.x >= previewPositions[i].pos.x + && event->xbutton.y >= previewPositions[i].pos.y + && event->xbutton.x < previewPositions[i].pos.x + + previewPositions[i].size.width + && event->xbutton.y < previewPositions[i].pos.y + + previewPositions[i].size.height) { + + WMSetPopUpButtonSelectedItem(panel->fontSel, i); + changePage(panel->fontSel, panel); + return; + } + } +} + +static void +changePage(WMWidget *w, void *data) +{ + _Panel *panel = (_Panel*)data; + int section; + WMScreen *scr = WMWidgetScreen(panel->box); + RContext *rc = WMScreenRContext(scr); + static WMPoint positions[] = { + {5, 15}, + {5, 62}, + {5, 110}, + {5, 140}, + {130, 62}, + {130, 132} + }; + + if (w) { + section = WMGetPopUpButtonSelectedItem(panel->fontSel); + } + { + WMColor *color; + + color = WMCreateRGBColor(scr, 0x5100, 0x5100, 0x7100, True); + XFillRectangle(rc->dpy, panel->preview, WMColorGC(color), + positions[panel->oldsection].x, + positions[panel->oldsection].y, 22, 22); + WMReleaseColor(color); + } + if (w) { + panel->oldsection = section; + WMDrawPixmap(panel->hand, panel->preview, positions[section].x, + positions[section].y); + } + WMRedisplayWidget(panel->prevL); + paintTextField(panel, section); + refillFontSetList(panel); +} + +static void +setLanguageType(void *data, Bool multiByte) +{ + _Panel *p = (_Panel*)data; + + if (multiByte) { + WMMapWidget(p->fsetL); + WMMapWidget(p->fsetLs); + WMMapWidget(p->addB); + WMMapWidget(p->editB); + WMMapWidget(p->remB); + WMMapWidget(p->upB); + WMMapWidget(p->downB); + + WMUnmapWidget(p->fontT); + WMUnmapWidget(p->changeB); + } else { + WMUnmapWidget(p->fsetL); + WMUnmapWidget(p->fsetLs); + WMUnmapWidget(p->addB); + WMUnmapWidget(p->editB); + WMUnmapWidget(p->remB); + WMUnmapWidget(p->upB); + WMUnmapWidget(p->downB); + + WMMapWidget(p->fontT); + WMMapWidget(p->changeB); + } +} + +static void +refillFontSetList(void *data) +{ + _Panel *panel = (_Panel*)data; + WMPropList *array; + char *encoding = getFontEncoding(panel); + int section = WMGetPopUpButtonSelectedItem(panel->fontSel); + int i; + //int pos; + WMClearList(panel->fsetLs); + if(!encoding) { + array = getCurrentFontProp(panel, section); + } else { + array = getDefaultFontProp(panel, encoding, section); + } + if(!array){ + wwarning("error not Font prop given"); + } else { + for (i = 0; i < WMGetPropListItemCount(array); i++) { + WMGetFromPLArray(array, i); + WMAddListItem( panel->fsetLs, + WMGetFromPLString( + WMGetFromPLArray(array, i))); + } + WMReleasePropList(array); + WMSelectListItem(panel->fsetLs, 0); + } + + checkListForArrows(panel); +} + +static void +insertCurrentFont(char *data, char *type) +{ + WMPropList *key; + WMPropList *array; + char *tmp, *str; + + key = WMCreatePLString(type); + array = WMCreatePLArray(NULL); + + str = wstrdup(data); + tmp = strtok(str, ","); + while(tmp) { + WMAddToPLArray(array, WMCreatePLString(tmp)); + tmp = strtok(NULL, ","); + } + wfree(str); + + + WMPutInPLDictionary(CurrentFontArray, key, array); +} + +static void +readFontEncodings(void *data) +{ + _Panel *panel = (_Panel*)data; + WMPropList *pl = NULL; + char *path; + char *msg; + + path = WMPathForResourceOfType("font.data", NULL); + if (!path) { + msg = _("Could not locate font information file WPrefs.app/font.data"); + goto error; + } + + pl = WMReadPropListFromFile(path); + if (!pl) { + msg = _("Could not read font information file WPrefs.app/font.data"); + goto error; + } else { + int i; + WMPropList *key = WMCreatePLString("Encodings"); + WMPropList *array; + WMMenuItem *mi; + + array = WMGetFromPLDictionary(pl, key); + WMReleasePropList(key); + if (!array || !WMIsPLArray(array)) { + msg = _("Invalid data in font information file WPrefs.app/font.data.\n" + "Encodings data not found."); + goto error; + } + + WMAddPopUpButtonItem(panel->langP, _("Current")); + + for (i = 0; i < WMGetPropListItemCount(array); i++) { + WMPropList *item, *str; + + item = WMGetFromPLArray(array, i); + str = WMGetFromPLArray(item, 0); + mi = WMAddPopUpButtonItem(panel->langP, WMGetFromPLString(str)); + WMSetMenuItemRepresentedObject(mi, WMRetainPropList(item)); + } + WMSetPopUpButtonSelectedItem(panel->langP, 0); + + + key = WMCreatePLString("WindowTitleFont"); + DefaultWindowTitleFont = WMRetainPropList(WMGetFromPLDictionary(pl, key)); + WMReleasePropList(key); + + key = WMCreatePLString("MenuTitleFont"); + DefaultMenuTitleFont = WMRetainPropList(WMGetFromPLDictionary(pl, key)); + WMReleasePropList(key); + + key = WMCreatePLString("MenuTextFont"); + DefaultMenuTextFont = WMRetainPropList(WMGetFromPLDictionary(pl, key)); + WMReleasePropList(key); + + key = WMCreatePLString("IconTitleFont"); + DefaultIconTitleFont = WMRetainPropList(WMGetFromPLDictionary(pl, key)); + WMReleasePropList(key); + + key = WMCreatePLString("ClipTitleFont"); + DefaultClipTitleFont = WMRetainPropList(WMGetFromPLDictionary(pl, key)); + WMReleasePropList(key); + + key = WMCreatePLString("LargeDisplayFont"); + DefaultLargeDisplayFont = WMRetainPropList(WMGetFromPLDictionary(pl, key)); + WMReleasePropList(key); + } + + WMReleasePropList(pl); + return; +error: + if (pl) + WMReleasePropList(pl); + + WMRunAlertPanel(WMWidgetScreen(panel->parent), panel->parent, + _("Error"), msg, _("OK"), NULL, NULL); +} + +static void +checkListForArrows(void *data) +{ + _Panel *panel = (_Panel*)data; + int list; + list = WMGetListNumberOfRows(panel->fsetLs); + + if(list > 1) + { + if(WMGetListSelectedItemRow(panel->fsetLs) == 0) { + WMSetButtonEnabled(panel->upB, False); + WMSetButtonEnabled(panel->downB, True); + } else if(WMGetListSelectedItemRow(panel->fsetLs) == list-1) { + WMSetButtonEnabled(panel->downB, False); + WMSetButtonEnabled(panel->upB, True); + } else { + WMSetButtonEnabled(panel->upB, True); + WMSetButtonEnabled(panel->downB, True); + } + + } else { + WMSetButtonEnabled(panel->upB, False); + WMSetButtonEnabled(panel->downB, False); + } + /* added to control the Remove button */ + if(list > 1) + WMSetButtonEnabled(panel->remB, True); + else + WMSetButtonEnabled(panel->remB, False); +} + +static char* +fontOfLang(void *data, char *encoding, int section) +{ + _Panel *panel = (_Panel*)data; + WMPropList *array; + char *buf = NULL; + int i; + + if(!encoding) + array = getCurrentFontProp(panel, section); + else + array = getDefaultFontProp(panel, encoding, section); + + if(!array) { + wwarning("error no font prop given"); + return NULL; + } else { + for(i=0; ibox); + int section; + + section = WMGetPopUpButtonSelectedItem(w); + + if(isEncodingMultiByte(panel)) { + setLanguageType(panel, True); + } else { + if(panel->MultiByteText) setLanguageType(panel, True); + else setLanguageType(panel, False); + } + + paintPreviewBox(panel, EVERYTHING); + changePage(panel->fontSel, panel); +} + +static WMFont* +getFontForPreview(void *data, int element) +{ + _Panel *panel = (_Panel*)data; + WMFont *font; + char *fname; + WMScreen *scr = WMWidgetScreen(panel->box); + char *encoding = getFontEncoding(panel); + fname = fontOfLang(panel, encoding, element); + //if (WMHasAntialiasingSupport(scr)) { + if(panel->AntialiasedText) { + // fix this -Dan font = WMCreateFontWithFlags(scr, fname, WFAntialiased); + font = WMCreateFont(scr, fname); + } else { + font = WMCreateFont(scr, fname); + } + //} else { + // font = WMCreateFont(scr, fname); + //} + if(!font) { + char *msg; + int length; + length = strlen("\"")+ + strlen(fname)+strlen("\" was not loaded correctly. Make sure the font is available for that encoding.\nLoadind default system font."); + msg = wmalloc(length +1); + snprintf(msg, length + 1, + "\"%s\" was not loaded correctly. Make sure the font is available for that encoding.\nLoading default system font.", + fname); + WMRunAlertPanel(WMWidgetScreen(panel->parent),panel->parent, + _("Warning"), msg, _("OK"), NULL, NULL); + font = getDefaultSystemFont(panel, element); + } + return font; +} + +static char* +getFontSampleString(void *data) +{ + _Panel *panel = (_Panel*)data; + //WMScreen *scr = WMWidgetScreen(panel->box); + WMMenuItem *mi; + WMPropList *pl; + int section; + + section = WMGetPopUpButtonSelectedItem(panel->langP); + mi = WMGetPopUpButtonMenuItem(panel->langP, section); + pl = WMGetMenuItemRepresentedObject(mi); + + if (!pl) { + return NULL; + } else { + char *sample; + sample = WMGetFromPLString(WMGetFromPLArray(pl,3)); + return sample; + } +} + +static char* +getFontEncoding(void *data) +{ + _Panel *panel = (_Panel*)data; + //WMScreen *scr = WMWidgetScreen(panel->box); + WMMenuItem *mi; + WMPropList *pl; + int section; + + section = WMGetPopUpButtonSelectedItem(panel->langP); + mi = WMGetPopUpButtonMenuItem(panel->langP, section); + pl = WMGetMenuItemRepresentedObject(mi); + + if (!pl) { + return NULL; + } else { + char *encoding; + encoding = WMGetFromPLString(WMGetFromPLArray(pl,2)); + return encoding; + } +} + +static Bool +isEncodingMultiByte(void *data) +{ + _Panel *panel = (_Panel*)data; + //WMScreen *scr = WMWidgetScreen(panel->box); + WMMenuItem *mi; + WMPropList *pl; + int section; + + section = WMGetPopUpButtonSelectedItem(panel->langP); + mi = WMGetPopUpButtonMenuItem(panel->langP, section); + pl = WMGetMenuItemRepresentedObject(mi); + + if (!pl) { + return False; + } else { + char *multiByte; + int res; + multiByte = WMGetFromPLString(WMGetFromPLArray(pl,1)); + res = atoi(multiByte); + if(res) + return True; + else + return False; + } +} + +static WMPropList* +getCurrentFontProp(void *data, int section) +{ + WMPropList *array; + switch (section) { + case 0: + array = WMRetainPropList( + WMGetFromPLDictionary(CurrentFontArray, + WMCreatePLString("WindowTitleFont"))); + break; + case 1: + array = WMRetainPropList( + WMGetFromPLDictionary(CurrentFontArray, + WMCreatePLString("LargeDisplayFont"))); + break; + case 2: + array = WMRetainPropList( + WMGetFromPLDictionary(CurrentFontArray, + WMCreatePLString("MenuTitleFont"))); + break; + case 3: + array = WMRetainPropList( + WMGetFromPLDictionary(CurrentFontArray, + WMCreatePLString("MenuTextFont"))); + break; + case 4: + array = WMRetainPropList( + WMGetFromPLDictionary(CurrentFontArray, + WMCreatePLString("ClipTitleFont"))); + break; + case 5: + array = WMRetainPropList( + WMGetFromPLDictionary(CurrentFontArray, + WMCreatePLString("IconTitleFont"))); + break; + } + if(!WMIsPLArray(array)) { + return NULL; + } else { + return array; + } +} + +static WMPropList* +getDefaultFontProp(void *data, char *encoding, int section) +{ + WMPropList *array; + WMPropList *key = WMCreatePLString(encoding); + switch (section) { + case 0: + array = WMRetainPropList( + WMGetFromPLDictionary(DefaultWindowTitleFont, key)); + WMReleasePropList(key); + break; + case 1: + array = WMRetainPropList( + WMGetFromPLDictionary(DefaultLargeDisplayFont, key)); + WMReleasePropList(key); + break; + case 2: + array = WMRetainPropList( + WMGetFromPLDictionary(DefaultMenuTitleFont, key)); + WMReleasePropList(key); + break; + case 3: + array = WMRetainPropList( + WMGetFromPLDictionary(DefaultMenuTextFont, key)); + WMReleasePropList(key); + break; + case 4: + array = WMRetainPropList( + WMGetFromPLDictionary(DefaultClipTitleFont, key)); + WMReleasePropList(key); + break; + case 5: + array = WMRetainPropList( + WMGetFromPLDictionary(DefaultIconTitleFont, key)); + WMReleasePropList(key); + break; + } + if(!WMIsPLArray(array)) { + return NULL; + } else { + return array; + } +} + +static WMFont* +getDefaultSystemFont(void *data, int element) +{ + _Panel *panel = (_Panel*)data; + WMScreen *scr = WMWidgetScreen(panel->box); + + switch(element) { + case 0: + case 2: + return WMBoldSystemFontOfSize(scr, 12); + case 1: + return WMBoldSystemFontOfSize(scr, 24); + case 4: + case 5: + return WMSystemFontOfSize(scr, 8); + case 3: + default: + return WMSystemFontOfSize(scr, 12); + } +} + +static void +multiClick(WMWidget *w, void *data) +{ + _Panel *panel = (_Panel*)data; + if(!panel->MultiByteText) { + WMSetButtonText(panel->togMulti, _("Yes")); + setLanguageType(panel, True); + panel->MultiByteText = True; + } else { + WMSetButtonText(panel->togMulti, _("Auto")); + if(isEncodingMultiByte(panel)) setLanguageType(panel, True); + else setLanguageType(panel, False); + panel->MultiByteText = False; + } +} + +static void +toggleAA(WMWidget *w, void *data) +{ + _Panel *panel = (_Panel*)data; + //int section; + if(panel->AntialiasedText) + panel->AntialiasedText = False; + else + panel->AntialiasedText = True; + /* hmm now i gotta redraw all the fonts in the preview section + * and the text field + */ + paintPreviewBox(panel, EVERYTHING); + changePage(panel->fontSel, panel); + if(isEncodingMultiByte(panel)) setLanguageType(panel, True); +} + +static void +listClick(WMWidget *w, void *data) +{ + _Panel *panel = (_Panel*)data; + + checkListForArrows(panel); +} + +static void +moveUpListItem(WMWidget *w, void *data) +{ + _Panel *panel = (_Panel*)data; + WMListItem *tmp; + int pos; + char *listtext; + WMPropList *array; + WMPropList *string; + char *encoding = getFontEncoding(panel); + int section = WMGetPopUpButtonSelectedItem(panel->fontSel); + + if(!encoding) + array = getCurrentFontProp(panel, section); + else + array = getDefaultFontProp(panel, encoding, section); + + pos = WMGetListSelectedItemRow(panel->fsetLs); + + tmp = WMGetListItem(panel->fsetLs, pos); + listtext = wstrdup(tmp->text); + string = WMCreatePLString(listtext); + + WMRemoveListItem(panel->fsetLs, pos); + WMDeleteFromPLArray(array, pos); + WMInsertListItem(panel->fsetLs, pos-1, listtext); + WMInsertInPLArray(array, pos-1, string); + + paintPreviewBox(panel, EVERYTHING); + changePage(panel->fontSel, panel); + + WMSelectListItem(panel->fsetLs, pos-1); + checkListForArrows(panel); +} + +static void +moveDownListItem(WMWidget *w, void *data) +{ + _Panel *panel = (_Panel*)data; + WMListItem *tmp; + int pos; + char *listtext; + WMPropList *array; + WMPropList *string; + char *encoding = getFontEncoding(panel); + int section = WMGetPopUpButtonSelectedItem(panel->fontSel); + + if(!encoding) + array = getCurrentFontProp(panel, section); + else + array = getDefaultFontProp(panel, encoding, section); + + pos = WMGetListSelectedItemRow(panel->fsetLs); + + tmp = WMGetListItem(panel->fsetLs, pos); + listtext = wstrdup(tmp->text); + string = WMCreatePLString(listtext); + WMRemoveListItem(panel->fsetLs, pos); + WMDeleteFromPLArray(array, pos); + WMInsertListItem(panel->fsetLs, pos+1, listtext); + WMInsertInPLArray(array, pos+1, string); + + paintPreviewBox(panel, EVERYTHING); + changePage(panel->fontSel, panel); + + WMSelectListItem(panel->fsetLs, pos+1); + checkListForArrows(panel); +} + +static void +addButtonAction(WMWidget *w, void *data) +{ + _Panel *panel = (_Panel*)data; + char *chosenFont; + int pos; + WMPropList *array; + WMPropList *string; + char *encoding = getFontEncoding(panel); + int section = WMGetPopUpButtonSelectedItem(panel->fontSel); + + if(!encoding) + array = getCurrentFontProp(panel, section); + else + array = getDefaultFontProp(panel, encoding, section); + + WMHideFontPanel(panel->fontPanel); + chosenFont = WMGetFontName(WMGetFontPanelFont(panel->fontPanel)); + string = WMCreatePLString(chosenFont); + pos = WMGetListSelectedItemRow(panel->fsetLs); + WMInsertListItem(panel->fsetLs, pos+1, chosenFont); + WMInsertInPLArray(array, pos+1, string); + WMSelectListItem(panel->fsetLs, pos+1); + + paintPreviewBox(panel, EVERYTHING); + changePage(panel->fontSel, panel); +} + +static void +changeButtonAction(WMWidget *w, void *data) +{ + _Panel *panel = (_Panel*)data; + char *chosenFont; + int pos; + WMPropList *array; + WMPropList *string; + char *encoding = getFontEncoding(panel); + int section = WMGetPopUpButtonSelectedItem(panel->fontSel); + + if(!encoding) + array = getCurrentFontProp(panel, section); + else + array = getDefaultFontProp(panel, encoding, section); + + WMHideFontPanel(panel->fontPanel); + + chosenFont = WMGetFontName(WMGetFontPanelFont(panel->fontPanel)); + string = WMCreatePLString(chosenFont); + + pos = WMGetListSelectedItemRow(panel->fsetLs); + WMRemoveListItem(panel->fsetLs, pos); + WMDeleteFromPLArray(array, pos); + WMInsertListItem(panel->fsetLs, pos, chosenFont); + WMInsertInPLArray(array, pos, string); + WMSelectListItem(panel->fsetLs, pos); + + paintPreviewBox(panel, EVERYTHING); + changePage(panel->fontSel, panel); +} + +static void +changeButtonClick(WMWidget *w, void *data) +{ + _Panel *panel = (_Panel*)data; + + WMSetFontPanelAction(panel->fontPanel, changeButtonAction, panel); + WMShowFontPanel(panel->fontPanel); +} + +static void +addButtonClick(WMWidget *w, void *data) +{ + _Panel *panel = (_Panel*)data; + + WMSetFontPanelAction(panel->fontPanel, addButtonAction, panel); + WMShowFontPanel(panel->fontPanel); +} + +static void +removeButtonClick(WMWidget *w, void *data) +{ + _Panel *panel = (_Panel*)data; + int pos; + int list; + WMPropList *array; + char *encoding = getFontEncoding(panel); + int section = WMGetPopUpButtonSelectedItem(panel->fontSel); + + if(!encoding) + array = getCurrentFontProp(panel, section); + else + array = getDefaultFontProp(panel, encoding, section); + + pos = WMGetListSelectedItemRow(panel->fsetLs); + WMRemoveListItem(panel->fsetLs, pos); + WMDeleteFromPLArray(array, pos); + + list = WMGetListNumberOfRows(panel->fsetLs); + if(list != 0) { + if(list > pos) + WMSelectListItem(panel->fsetLs, pos); + else if(list == pos) + WMSelectListItem(panel->fsetLs, list-1); + else + WMSelectListItem(panel->fsetLs, 0); + } + checkListForArrows(panel); + + paintPreviewBox(panel, EVERYTHING); + changePage(panel->fontSel, panel); +} + +static void +showData(_Panel *panel) +{ + //WMScreen *scr = WMWidgetScreen(panel->parent); + char *str; + int i; + + CurrentFontArray = WMCreatePLDictionary(NULL, NULL); + + str = GetStringForKey("WindowTitleFont"); + insertCurrentFont(wstrdup(str), "WindowTitleFont"); + + str = GetStringForKey("LargeDisplayFont"); + insertCurrentFont(wstrdup(str), "LargeDisplayFont"); + + str = GetStringForKey("MenuTitleFont"); + insertCurrentFont(wstrdup(str), "MenuTitleFont"); + + str = GetStringForKey("MenuTextFont"); + insertCurrentFont(wstrdup(str), "MenuTextFont"); + + str = GetStringForKey("ClipTitleFont"); + insertCurrentFont(wstrdup(str), "ClipTitleFont"); + + str = GetStringForKey("IconTitleFont"); + insertCurrentFont(wstrdup(str), "IconTitleFont"); + + /* i put this here cause it needs to be known before we paint */ + readFontEncodings(panel); + + str = GetStringForKey("MenuStyle"); + if (str && strcasecmp(str, "flat")==0) { + panel->menuStyle = MSTYLE_FLAT; + } else if (str && strcasecmp(str, "singletexture")==0) { + panel->menuStyle = MSTYLE_SINGLE; + } else { + panel->menuStyle = MSTYLE_NORMAL; + } + + str = GetStringForKey("TitleJustify"); + if (str && strcasecmp(str, "left")==0) { + panel->titleAlignment = WALeft; + } else if (str && strcasecmp(str, "right")==0) { + panel->titleAlignment = WARight; + } else { + panel->titleAlignment = WACenter; + } + for (i = 0; i < sizeof(colorOptions)/(2*sizeof(char*)); i++) { + WMColor *color; + + str = GetStringForKey(colorOptions[i*2]); + if (!str) + str = colorOptions[i*2+1]; + + if (!(color = WMCreateNamedColor(WMWidgetScreen(panel->box), str, False))) { + color = WMCreateNamedColor(WMWidgetScreen(panel->box), "#000000", False); + } + panel->colors[i] = color; + } + + str = GetStringForKey("MultiByteText"); + if (str) + { + if (strcasecmp(str, "YES")==0) { + setLanguageType(panel, True); + WMSetButtonText(panel->togMulti, "Yes"); + printf("yes multi\n"); + panel->MultiByteText = True; + } else if (strcasecmp(str, "AUTO") == 0) { + char *locale; + locale = setlocale(LC_CTYPE, NULL); + if(locale != NULL + && (strncmp(locale, "ja", 2) == 0 + || strncmp(locale, "zh", 2) == 0 + || strncmp(locale, "ko", 2) == 0)) { + setLanguageType(panel, True); + WMSetButtonText(panel->togMulti, "Auto"); + printf("auto multi\n"); + panel->MultiByteText = True; + } else { + setLanguageType(panel, False); + WMSetButtonText(panel->togMulti, "Auto"); + panel->MultiByteText = False; + } + } + } else { + char *locale; + locale = setlocale(LC_CTYPE, NULL); + if(locale != NULL + && (strncmp(locale, "ja", 2) == 0 + || strncmp(locale, "zh", 2) == 0 + || strncmp(locale, "ko", 2) == 0)) { + setLanguageType(panel, True); + WMSetButtonText(panel->togMulti, "Auto"); + printf("auto multi\n"); + panel->MultiByteText = True; + } else { + setLanguageType(panel, False); + WMSetButtonText(panel->togMulti, "Auto"); + panel->MultiByteText = False; + } + } + /* gotta check for Antialiasing AFTER MultiByte incase the use has both + * to maintain behavior in Current Fonts set or i could add another if + * statement to setLanguageType =) */ + //if (WMHasAntialiasingSupport(scr)) { + WMMapWidget(panel->togAA); + if(GetBoolForKey("AntialiasedText")){ + WMSetButtonSelected(panel->togAA, True); + panel->AntialiasedText = True; + } else { + WMSetButtonSelected(panel->togAA, False); + panel->AntialiasedText = False; + } + //} else { + // WMUnmapWidget(panel->togAA); + //} + + + paintPreviewBox(panel, EVERYTHING); +} + +static void +createPanel(Panel *p) +{ + _Panel *panel = (_Panel*)p; + WMScreen *scr = WMWidgetScreen(panel->parent); + + + panel->box = WMCreateBox(panel->parent); + WMSetViewExpandsToParent(WMWidgetView(panel->box), 2, 2, 2, 2); + + panel->hand = WMCreatePixmapFromXPMData(scr, hand_xpm); + panel->up_arrow = WMCreatePixmapFromXPMData(scr, up_arrow_xpm); + panel->down_arrow = WMCreatePixmapFromXPMData(scr, down_arrow_xpm); + panel->alt_up_arrow = WMCreatePixmapFromXPMData(scr, alt_up_arrow_xpm); + panel->alt_down_arrow = WMCreatePixmapFromXPMData(scr, alt_down_arrow_xpm); + + panel->prevL = WMCreateLabel(panel->box); + WMResizeWidget(panel->prevL, 240, FRAME_HEIGHT - 45); + WMMoveWidget(panel->prevL, 15, 35); + WMSetLabelRelief(panel->prevL, WRSunken); + WMSetLabelImagePosition(panel->prevL, WIPImageOnly); + + WMCreateEventHandler(WMWidgetView(panel->prevL), ButtonPressMask, + previewClick, panel); + + /* Widget Selection */ + panel->fontSel = WMCreatePopUpButton(panel->box); + WMResizeWidget(panel->fontSel, 135, 20); + WMMoveWidget(panel->fontSel, 15, 10); + WMAddPopUpButtonItem(panel->fontSel, _("Window Title Font")); + WMAddPopUpButtonItem(panel->fontSel, _("Large Display Font")); + WMAddPopUpButtonItem(panel->fontSel, _("Menu Title Font")); + WMAddPopUpButtonItem(panel->fontSel, _("Menu Item Font" )); + WMAddPopUpButtonItem(panel->fontSel, _("Clip Title Font")); + WMAddPopUpButtonItem(panel->fontSel, _("Icon Title Font")); + + WMSetPopUpButtonSelectedItem(panel->fontSel, 0); + + WMSetPopUpButtonAction(panel->fontSel, changePage, panel); + + /* MultiByteText toggle */ + panel->multiF = WMCreateFrame(panel->box); + WMResizeWidget(panel->multiF, 70, 50); + WMMoveWidget(panel->multiF, 440, 10); + WMSetFrameTitle(panel->multiF, _("MultiByte")); + + + panel->togMulti = WMCreateCommandButton(panel->multiF); + WMResizeWidget(panel->togMulti, 40, 20); + WMMoveWidget(panel->togMulti, 15, 20); + WMSetButtonAction(panel->togMulti, multiClick, panel); + + WMMapSubwidgets(panel->multiF); + + /* language selection */ + panel->langF = WMCreateFrame(panel->box); + WMResizeWidget(panel->langF, 165, 50); + WMMoveWidget(panel->langF, 265, 10); + WMSetFrameTitle(panel->langF, _("Default Font Encodings")); + + panel->langP = WMCreatePopUpButton(panel->langF); + WMResizeWidget(panel->langP, 135, 20); + WMMoveWidget(panel->langP, 15, 20); + + WMSetPopUpButtonAction(panel->langP, changeLanguageAction, panel); + + WMMapSubwidgets(panel->langF); + + /* Antialiasing */ + //if (WMHasAntialiasingSupport(scr)) { + panel->togAA = WMCreateSwitchButton(panel->box); + WMResizeWidget(panel->togAA, 110, 20); + WMMoveWidget(panel->togAA, 155, 10); + WMSetButtonText(panel->togAA, _("Smooth Fonts")); + WMSetBalloonTextForView(_("Smooth Font edges for the eye candy\n" + "requires a restart after saving"), + WMWidgetView(panel->togAA)); + WMSetButtonAction(panel->togAA, toggleAA, panel); + //} + /* multibyte */ + panel->fsetL = WMCreateLabel(panel->box); + WMResizeWidget(panel->fsetL, 245, 20); + WMMoveWidget(panel->fsetL, 265, 70); + WMSetLabelText(panel->fsetL, _("Font Set")); + WMSetLabelRelief(panel->fsetL, WRSunken); + WMSetLabelTextAlignment(panel->fsetL, WACenter); + { + WMFont *font; + WMColor *color; + + color = WMDarkGrayColor(scr); + font = WMBoldSystemFontOfSize(scr, 12); + + WMSetWidgetBackgroundColor(panel->fsetL, color); + WMSetLabelFont(panel->fsetL, font); + + WMReleaseFont(font); + WMReleaseColor(color); + + color = WMWhiteColor(scr); + WMSetLabelTextColor(panel->fsetL, color); + WMReleaseColor(color); + } + + panel->fsetLs = WMCreateList(panel->box); + WMResizeWidget(panel->fsetLs, 245, 86); + WMMoveWidget(panel->fsetLs, 265, 92); + WMSetListAction(panel->fsetLs, listClick, panel); + WMSetListDoubleAction(panel->fsetLs, changeButtonClick, panel); + + panel->addB = WMCreateCommandButton(panel->box); + WMResizeWidget(panel->addB, 78, 24); + WMMoveWidget(panel->addB, 265, 201); + WMSetButtonText(panel->addB, _("Add...")); + WMSetButtonAction(panel->addB, addButtonClick, panel); + + panel->editB = WMCreateCommandButton(panel->box); + WMResizeWidget(panel->editB, 78, 24); + WMMoveWidget(panel->editB, 348, 201); + WMSetButtonText(panel->editB, _("Change...")); + WMSetButtonAction(panel->editB, changeButtonClick, panel); + + panel->remB = WMCreateCommandButton(panel->box); + WMResizeWidget(panel->remB, 78, 24); + WMMoveWidget(panel->remB, 431, 201); + WMSetButtonText(panel->remB, _("Remove")); + WMSetButtonAction(panel->remB, removeButtonClick, panel); + + /* happy Up/Down buttons */ + panel->upB = WMCreateCommandButton(panel->box); + WMResizeWidget(panel->upB, 16, 16); + WMMoveWidget(panel->upB, 265, 182); + WMSetButtonImage(panel->upB, panel->up_arrow); + WMSetButtonAltImage(panel->upB, panel->alt_up_arrow); + WMSetButtonImagePosition(panel->upB, WIPImageOnly); + WMSetButtonImageDimsWhenDisabled(panel->upB, True); + WMSetButtonAction(panel->upB, moveUpListItem, panel); + + panel->downB = WMCreateCommandButton(panel->box); + WMResizeWidget(panel->downB, 16, 16); + WMMoveWidget(panel->downB, 286, 182); + WMSetButtonImage(panel->downB, panel->down_arrow); + WMSetButtonAltImage(panel->downB, panel->alt_down_arrow); + WMSetButtonImagePosition(panel->downB, WIPImageOnly); + WMSetButtonImageDimsWhenDisabled(panel->downB, True); + WMSetButtonAction(panel->downB, moveDownListItem, panel); + + /* single byte */ + panel->fontT = WMCreateTextField(panel->box); + WMResizeWidget(panel->fontT, 245, 30); + WMMoveWidget(panel->fontT, 265, 120); + + panel->changeB = WMCreateCommandButton(panel->box); + WMResizeWidget(panel->changeB, 104, 24); + WMMoveWidget(panel->changeB, 335, 160); + WMSetButtonText(panel->changeB, _("Change...")); + WMSetButtonAction(panel->changeB, changeButtonClick, panel); + + + panel->black = WMBlackColor(scr); + panel->white = WMWhiteColor(scr); + panel->light = WMGrayColor(scr); + panel->dark = WMDarkGrayColor(scr); + panel->back = WMCreateRGBColor(scr, 0x5100, 0x5100, 0x7100, True); + + /* Font Panel !!!!! */ + panel->fontPanel = WMGetFontPanel(scr); + +#if 0 + for (i = 0; Languages[i].language != NULL; i++) { + WMAddPopUpButtonItem(panel->langP, Languages[i].language); + } + + for (i = 0; Options[i].description != NULL; i++) { + WMAddListItem(panel->settingLs, Options[i].description); + } +#endif + WMRealizeWidget(panel->box); + WMMapSubwidgets(panel->box); + + showData(panel); + changePage(panel->fontSel, panel); +} + +static void +storeData(Panel *p) +{ + _Panel *panel = (_Panel*)p; + int i; + + char *encoding = getFontEncoding(panel); + + for(i=0;i < 6; i++) + { + switch(i) { + case 0: + SetStringForKey(fontOfLang(panel, encoding, i), + "WindowTitleFont"); + break; + case 1: + SetStringForKey(fontOfLang(panel, encoding, i), + "LargeDisplayFont"); + break; + case 2: + SetStringForKey(fontOfLang(panel, encoding, i), + "MenuTitleFont"); + break; + case 3: + SetStringForKey(fontOfLang(panel, encoding, i), + "MenuTextFont"); + break; + case 4: + SetStringForKey(fontOfLang(panel, encoding, i), + "ClipTitleFont"); + break; + case 5: + SetStringForKey(fontOfLang(panel, encoding, i), + "IconTitleFont"); + break; + } + } + + //if (WMHasAntialiasingSupport(WMWidgetScreen(panel->box))) + SetBoolForKey(WMGetButtonSelected(panel->togAA), "AntialiasedText"); + + if(panel->MultiByteText) + SetStringForKey("YES", "MultiByteText"); + else { + if(isEncodingMultiByte(panel)) SetStringForKey("YES", "MultiByteText"); + else SetStringForKey("AUTO", "MultiByteText"); + } +} + +static void +prepClosure(Panel *p) +{ + _Panel *panel = (_Panel*)p; + WMFreeFontPanel(panel->fontPanel); + WMReleasePropList(CurrentFontArray); + /* and what ever else i've forgotten or overlooked + * maybe someone will add them */ +} + +Panel* +InitFont(WMScreen *scr, WMWidget *parent) +{ + _Panel *panel; + + panel = wmalloc(sizeof(_Panel)); + memset(panel, 0, sizeof(_Panel)); + + panel->sectionName = _("Font Preferences"); + panel->description = _("Font Configurations for Windows, Menus etc"); + + panel->parent = parent; + + panel->callbacks.createWidgets = createPanel; + panel->callbacks.updateDomain = storeData; + panel->callbacks.prepareForClose = prepClosure; + + AddSection(panel, ICON_FILE); + + return panel; +} + diff -Naur WindowMaker-0.91.0/WPrefs.app/FontSimple.c wm/WPrefs.app/FontSimple.c --- WindowMaker-0.91.0/WPrefs.app/FontSimple.c 2004-10-24 01:59:18 +0400 +++ wm/WPrefs.app/FontSimple.c 2004-10-26 16:04:18 +0400 @@ -39,6 +39,7 @@ # define FC_WEIGHT_ULTRABOLD FC_WEIGHT_EXTRABOLD # define FC_WEIGHT_HEAVY FC_WEIGHT_BLACK /* Widths */ +# define FC_WIDTH "width" # define FC_WIDTH_ULTRACONDENSED 50 # define FC_WIDTH_EXTRACONDENSED 63 # define FC_WIDTH_CONDENSED 75 diff -Naur WindowMaker-0.91.0/WPrefs.app/Makefile.am wm/WPrefs.app/Makefile.am --- WindowMaker-0.91.0/WPrefs.app/Makefile.am 2004-10-17 09:14:48 +0400 +++ wm/WPrefs.app/Makefile.am 2004-11-01 03:50:19 +0300 @@ -2,11 +2,11 @@ AUTOMAKE_OPTIONS = no-dependencies -wpexecbindir = @wprefsdir@ +wpexecbindir = @wprefs_bindir@ wpexecbin_PROGRAMS = WPrefs -wpdatadir = @wprefsdir@ +wpdatadir = @wprefs_datadir@ wpdata_DATA = WPrefs.tiff WPrefs.xpm diff -Naur WindowMaker-0.91.0/WPrefs.app/Makefile.in wm/WPrefs.app/Makefile.in --- WindowMaker-0.91.0/WPrefs.app/Makefile.in 2004-10-26 08:10:47 +0400 +++ wm/WPrefs.app/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,484 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -SUBDIRS = xpm tiff po - -AUTOMAKE_OPTIONS = no-dependencies - -wpexecbindir = @wprefsdir@ - -wpexecbin_PROGRAMS = WPrefs - -wpdatadir = @wprefsdir@ - -wpdata_DATA = WPrefs.tiff WPrefs.xpm - -EXTRA_DIST = $(wpdata_DATA) - -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_CFLAGS = @NOSTRICTALIASING@ - -INCLUDES = -I$(top_srcdir)/wrlib -I$(top_srcdir)/WINGs @HEADER_SEARCH_PATH@ - -WPrefs_DEPENDENCIES = $(top_builddir)/WINGs/libWINGs.a - -WPrefs_LDADD = $(top_builddir)/WINGs/libWINGs.a $(top_builddir)/wrlib/libwraster.la @XFTLIBS@ @INTLIBS@ - -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../src/config.h -CONFIG_CLEAN_FILES = -wpexecbin_PROGRAMS = WPrefs$(EXEEXT) -PROGRAMS = $(wpexecbin_PROGRAMS) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I../src -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -WPrefs_OBJECTS = main.$(OBJEXT) WPrefs.$(OBJEXT) Appearance.$(OBJEXT) \ -Configurations.$(OBJEXT) Expert.$(OBJEXT) Focus.$(OBJEXT) \ -FontSimple.$(OBJEXT) Icons.$(OBJEXT) KeyboardSettings.$(OBJEXT) \ -KeyboardShortcuts.$(OBJEXT) Menu.$(OBJEXT) MenuPreferences.$(OBJEXT) \ -MouseSettings.$(OBJEXT) Paths.$(OBJEXT) Preferences.$(OBJEXT) \ -TexturePanel.$(OBJEXT) Themes.$(OBJEXT) WindowHandling.$(OBJEXT) \ -Workspace.$(OBJEXT) double.$(OBJEXT) editmenu.$(OBJEXT) \ -imagebrowser.$(OBJEXT) xmodifier.$(OBJEXT) -WPrefs_LDFLAGS = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DATA = $(wpdata_DATA) - -DIST_COMMON = README Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = $(WPrefs_SOURCES) -OBJECTS = $(WPrefs_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-wpexecbinPROGRAMS: - -clean-wpexecbinPROGRAMS: - -test -z "$(wpexecbin_PROGRAMS)" || rm -f $(wpexecbin_PROGRAMS) - -distclean-wpexecbinPROGRAMS: - -maintainer-clean-wpexecbinPROGRAMS: - -install-wpexecbinPROGRAMS: $(wpexecbin_PROGRAMS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(wpexecbindir) - @list='$(wpexecbin_PROGRAMS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(wpexecbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ - $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) $$p $(DESTDIR)$(wpexecbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - else :; fi; \ - done - -uninstall-wpexecbinPROGRAMS: - @$(NORMAL_UNINSTALL) - list='$(wpexecbin_PROGRAMS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(wpexecbindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ - done - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -WPrefs$(EXEEXT): $(WPrefs_OBJECTS) $(WPrefs_DEPENDENCIES) - @rm -f WPrefs$(EXEEXT) - $(LINK) $(WPrefs_LDFLAGS) $(WPrefs_OBJECTS) $(WPrefs_LDADD) $(LIBS) - -install-wpdataDATA: $(wpdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(wpdatadir) - @list='$(wpdata_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(wpdatadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(wpdatadir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(wpdatadir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(wpdatadir)/$$p; \ - fi; fi; \ - done - -uninstall-wpdataDATA: - @$(NORMAL_UNINSTALL) - list='$(wpdata_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(wpdatadir)/$$p; \ - done - -# This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. - -@SET_MAKE@ - -all-recursive install-data-recursive install-exec-recursive \ -installdirs-recursive install-recursive uninstall-recursive \ -check-recursive installcheck-recursive info-recursive dvi-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" - -mostlyclean-recursive clean-recursive distclean-recursive \ -maintainer-clean-recursive: - @set fnord $(MAKEFLAGS); amf=$$2; \ - dot_seen=no; \ - rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ - rev="$$subdir $$rev"; \ - test "$$subdir" != "." || dot_seen=yes; \ - done; \ - test "$$dot_seen" = "no" && rev=". $$rev"; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ - test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \ - fi; \ - done; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WPrefs.app - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done - for subdir in $(SUBDIRS); do \ - if test "$$subdir" = .; then :; else \ - test -d $(distdir)/$$subdir \ - || mkdir $(distdir)/$$subdir \ - || exit 1; \ - chmod 777 $(distdir)/$$subdir; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \ - || exit 1; \ - fi; \ - done -info-am: -info: info-recursive -dvi-am: -dvi: dvi-recursive -check-am: all-am -check: check-recursive -installcheck-am: -installcheck: installcheck-recursive -install-exec-am: install-wpexecbinPROGRAMS -install-exec: install-exec-recursive - -install-data-am: install-wpdataDATA -install-data: install-data-recursive - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-recursive -uninstall-am: uninstall-wpexecbinPROGRAMS uninstall-wpdataDATA -uninstall: uninstall-recursive -all-am: Makefile $(PROGRAMS) $(DATA) -all-redirect: all-recursive -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: installdirs-recursive -installdirs-am: - $(mkinstalldirs) $(DESTDIR)$(wpexecbindir) $(DESTDIR)$(wpdatadir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-wpexecbinPROGRAMS mostlyclean-compile \ - mostlyclean-libtool mostlyclean-tags \ - mostlyclean-generic - -mostlyclean: mostlyclean-recursive - -clean-am: clean-wpexecbinPROGRAMS clean-compile clean-libtool \ - clean-tags clean-generic mostlyclean-am - -clean: clean-recursive - -distclean-am: distclean-wpexecbinPROGRAMS distclean-compile \ - distclean-libtool distclean-tags distclean-generic \ - clean-am - -rm -f libtool - -distclean: distclean-recursive - -maintainer-clean-am: maintainer-clean-wpexecbinPROGRAMS \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-tags maintainer-clean-generic \ - distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-recursive - -.PHONY: mostlyclean-wpexecbinPROGRAMS distclean-wpexecbinPROGRAMS \ -clean-wpexecbinPROGRAMS maintainer-clean-wpexecbinPROGRAMS \ -uninstall-wpexecbinPROGRAMS install-wpexecbinPROGRAMS \ -mostlyclean-compile distclean-compile clean-compile \ -maintainer-clean-compile mostlyclean-libtool distclean-libtool \ -clean-libtool maintainer-clean-libtool uninstall-wpdataDATA \ -install-wpdataDATA install-data-recursive uninstall-data-recursive \ -install-exec-recursive uninstall-exec-recursive installdirs-recursive \ -uninstalldirs-recursive all-recursive check-recursive \ -installcheck-recursive info-recursive dvi-recursive \ -mostlyclean-recursive distclean-recursive clean-recursive \ -maintainer-clean-recursive tags tags-recursive mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck install-exec-am \ -install-exec install-data-am install-data install-am install \ -uninstall-am uninstall all-redirect all-am all installdirs-am \ -installdirs mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WPrefs.app/po/CVS/Entries wm/WPrefs.app/po/CVS/Entries --- WindowMaker-0.91.0/WPrefs.app/po/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/po/CVS/Entries 2005-05-17 22:43:15 +0400 @@ -0,0 +1,22 @@ +/.cvsignore/1.6/Wed Apr 2 11:37:07 2003// +/Makefile.am/1.30/Tue Oct 26 20:03:06 2004// +/README/1.30/Sun Oct 17 04:32:25 2004// +/bg.po/1.4/Sun Oct 17 04:32:25 2004// +/ca.po/1.3/Sun Oct 17 04:32:25 2004// +/cs.po/1.11/Sun Oct 17 04:32:25 2004// +/de.po/1.11/Sun Oct 17 04:32:25 2004// +/es.po/1.8/Sun Oct 17 04:32:25 2004// +/et.po/1.3/Tue Oct 26 03:44:08 2004// +/fi.po/1.6/Sun Oct 17 04:32:25 2004// +/fr.po/1.11/Sun Oct 17 04:32:25 2004// +/hr.po/1.7/Sun Oct 17 04:32:25 2004// +/hu.po/1.4/Tue Oct 26 03:40:44 2004// +/it.po/1.7/Tue Oct 26 03:44:08 2004// +/ja.po/1.7/Tue Oct 26 20:03:06 2004// +/ko.po/1.14/Tue Oct 26 03:44:08 2004// +/pt.po/1.6/Sun Oct 17 04:32:25 2004// +/ru.po/1.6/Sun Oct 17 04:32:25 2004// +/sk.po/1.5/Sun Oct 17 04:32:25 2004// +/zh_CN.po/1.4/Sun Oct 17 04:32:25 2004// +/zh_TW.po/1.2/Fri Jan 21 04:05:48 2005// +D diff -Naur WindowMaker-0.91.0/WPrefs.app/po/CVS/Repository wm/WPrefs.app/po/CVS/Repository --- WindowMaker-0.91.0/WPrefs.app/po/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/po/CVS/Repository 2005-05-17 22:43:13 +0400 @@ -0,0 +1 @@ +wm/WPrefs.app/po diff -Naur WindowMaker-0.91.0/WPrefs.app/po/CVS/Root wm/WPrefs.app/po/CVS/Root --- WindowMaker-0.91.0/WPrefs.app/po/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/po/CVS/Root 2005-05-17 22:43:13 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WPrefs.app/po/.cvsignore wm/WPrefs.app/po/.cvsignore --- WindowMaker-0.91.0/WPrefs.app/po/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/po/.cvsignore 2003-04-02 15:37:07 +0400 @@ -0,0 +1,4 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt +*.pot +*.mo diff -Naur WindowMaker-0.91.0/WPrefs.app/po/ja.po wm/WPrefs.app/po/ja.po --- WindowMaker-0.91.0/WPrefs.app/po/ja.po 2004-10-26 07:52:38 +0400 +++ wm/WPrefs.app/po/ja.po 2004-10-27 00:03:06 +0400 @@ -4,309 +4,85 @@ # Takeo Hashimoto # collaborated with members in wmaker-jp ML and Project Vine # -# Last Update: version 0.45 +# Last Update: for WindowMaker 0.91.0 # msgid "" msgstr "" -"Project-Id-Version: WPrefs.app 0.45\n" -"POT-Creation-Date: 2001-09-08 12:43+0900\n" -"PO-Revision-Date: 2001-09-12 03:20+0900\n" +"Project-Id-Version: WPrefs.app \n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2004-10-26 21:52+0900\n" +"PO-Revision-Date: 2004-10-26 22:00+0900\n" "Last-Translator: Takeo Hashimoto \n" -"Language-Team: Japanese\n" +"Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8bit\n" -#: ../../WPrefs.app/main.c:74 -#, c-format -msgid "usage: %s [options]\n" -msgstr "使用法: %s [オプション]\n" - -#: ../../WPrefs.app/main.c:75 -msgid "options:" -msgstr "オプション:" - -#: ../../WPrefs.app/main.c:76 -msgid " -display \tdisplay to be used" -msgstr " -display \t使用するディスプレイ" - -#: ../../WPrefs.app/main.c:77 -msgid " --version\t\tprint version number and exit" -msgstr " -version\t\tバージョンを表示して終了" - -#: ../../WPrefs.app/main.c:78 -msgid " --help\t\tprint this message and exit" -msgstr " --help\t\tこのメッセージを表示して終了" - -#: ../../WPrefs.app/main.c:137 -#, c-format -msgid "too few arguments for %s" -msgstr "%s に対する引数が少なすぎます" - -#: ../../WPrefs.app/main.c:159 -msgid "X server does not support locale" -msgstr "Xサーバがロケール機能をサポートしていません" - -#: ../../WPrefs.app/main.c:162 -msgid "cannot set locale modifiers" -msgstr "ロケールを設定できません" - -#: ../../WPrefs.app/main.c:168 -#, c-format -msgid "could not open display %s" -msgstr "ディスプレイ %s を開けません" - -#: ../../WPrefs.app/main.c:176 -msgid "could not initialize application" -msgstr "アプリケーションを初期化できません" - -#: ../../WPrefs.app/WPrefs.c:259 -msgid "Window Maker Preferences" -msgstr "Window Maker の設定" - -#: ../../WPrefs.app/WPrefs.c:283 -msgid "Revert Page" -msgstr "ページを復帰" - -#: ../../WPrefs.app/WPrefs.c:289 -msgid "Revert All" -msgstr "全てを復帰" - -#: ../../WPrefs.app/WPrefs.c:295 -msgid "Save" -msgstr "保存" - -#: ../../WPrefs.app/Appearance.c:2294 ../../WPrefs.app/WPrefs.c:301 -msgid "Close" -msgstr "閉じる" - -#: ../../WPrefs.app/WPrefs.c:308 -msgid "Balloon Help" -msgstr "バルーンヘルプ" - -#: ../../WPrefs.app/WPrefs.c:333 -msgid "Window Maker Preferences Utility" -msgstr "Window Maker 設定ユーティリティ" - -#: ../../WPrefs.app/WPrefs.c:340 -#, c-format -msgid "Version %s for Window Maker %s or newer" -msgstr "バージョン %s (Window Maker %s 以降対応)" - -#: ../../WPrefs.app/WPrefs.c:348 -msgid "Starting..." -msgstr "起動中..." - -#: ../../WPrefs.app/WPrefs.c:354 -msgid "" -"Programming/Design: Alfredo K. Kojima\n" -"Artwork: Marco van Hylckama Vlieg, Largo et al\n" -"More Programming: James Thompson et al" -msgstr "" -"プログラム/デザイン: Alfredo K. Kojima\n" -"美術: Marco van Hylckama Vlieg\n" -"プログラム: James Thompson" - -#: ../../WPrefs.app/WPrefs.c:454 -#, c-format -msgid "could not locate image file %s\n" -msgstr "イメージファイル %s が見付かりません\n" - -#: ../../WPrefs.app/Appearance.c:1965 ../../WPrefs.app/Configurations.c:242 -#: ../../WPrefs.app/Configurations.c:254 ../../WPrefs.app/Focus.c:289 -#: ../../WPrefs.app/Focus.c:300 ../../WPrefs.app/MenuPreferences.c:135 -#: ../../WPrefs.app/MenuPreferences.c:146 -#: ../../WPrefs.app/MenuPreferences.c:174 -#: ../../WPrefs.app/MenuPreferences.c:189 ../../WPrefs.app/MouseSettings.c:560 -#: ../../WPrefs.app/MouseSettings.c:571 ../../WPrefs.app/WPrefs.c:557 -#: ../../WPrefs.app/WPrefs.c:582 -#, c-format -msgid "could not load icon file %s" -msgstr "アイコン %s がロードできません" - -#: ../../WPrefs.app/WPrefs.c:669 -#, c-format -msgid "could not load image file %s:%s" -msgstr "画像ファイル %s:%s を開けません" - -#: ../../WPrefs.app/WPrefs.c:688 -msgid "Loading Window Maker configuration files..." -msgstr "Window Maker の設定ファイルを読み込み中..." - -#: ../../WPrefs.app/WPrefs.c:692 -msgid "Initializing configuration panels..." -msgstr "設定パネルを初期化中..." - -#: ../../WPrefs.app/WPrefs.c:726 -msgid "" -"WPrefs is free software and is distributed WITHOUT ANY\n" -"WARRANTY under the terms of the GNU General Public License." -msgstr "" -"WPrefs はフリーソフトであり GNU 一般公有使用許諾書の下で\n" -"無保証で配布されます." - -#: ../../WPrefs.app/WPrefs.c:755 ../../WPrefs.app/WPrefs.c:835 -#, c-format -msgid "Window Maker domain (%s) is corrupted!" -msgstr "Window Maker のドメイン (%s) に障害!" - -#: ../../WPrefs.app/Font.c:330 ../../WPrefs.app/Menu.c:1533 -#: ../../WPrefs.app/MouseSettings.c:140 ../../WPrefs.app/MouseSettings.c:160 -#: ../../WPrefs.app/TexturePanel.c:613 ../../WPrefs.app/TexturePanel.c:693 -#: ../../WPrefs.app/Themes.c:96 ../../WPrefs.app/WPrefs.c:756 -#: ../../WPrefs.app/WPrefs.c:761 ../../WPrefs.app/WPrefs.c:779 -#: ../../WPrefs.app/WPrefs.c:789 ../../WPrefs.app/WPrefs.c:799 -#: ../../WPrefs.app/WPrefs.c:836 ../../WPrefs.app/WPrefs.c:841 -msgid "Error" -msgstr "エラー" - -#: ../../WPrefs.app/Font.c:330 ../../WPrefs.app/Menu.c:1533 -#: ../../WPrefs.app/MouseSettings.c:142 ../../WPrefs.app/MouseSettings.c:162 -#: ../../WPrefs.app/TexturePanel.c:614 ../../WPrefs.app/TexturePanel.c:695 -#: ../../WPrefs.app/TexturePanel.c:1529 ../../WPrefs.app/Themes.c:98 -#: ../../WPrefs.app/WPrefs.c:756 ../../WPrefs.app/WPrefs.c:761 -#: ../../WPrefs.app/WPrefs.c:781 ../../WPrefs.app/WPrefs.c:793 -#: ../../WPrefs.app/WPrefs.c:799 ../../WPrefs.app/WPrefs.c:806 -#: ../../WPrefs.app/WPrefs.c:836 ../../WPrefs.app/WPrefs.c:841 -msgid "OK" -msgstr "OK" - -#: ../../WPrefs.app/WPrefs.c:759 -#, c-format -msgid "Could not load Window Maker domain (%s) from defaults database." -msgstr "Window Maker domain (%s) をデフォルトデータベースから読み込めません" - -#: ../../WPrefs.app/WPrefs.c:776 -msgid "could not extract version information from Window Maker" -msgstr "Window Maker からバージョン情報を取得できません" - -#: ../../WPrefs.app/WPrefs.c:777 -msgid "Make sure wmaker is in your search path." -msgstr "wmaker がサーチパスに含まれているか確認して下さい" - -#: ../../WPrefs.app/WPrefs.c:780 -msgid "" -"Could not extract version from Window Maker. Make sure it is correctly " -"installed and is in your PATH environment variable." -msgstr "" -"Window Maker のバージョン情報を読み取れません. 適切にインストールして, PATH " -"設定をしてあることを確認してください" - -#: ../../WPrefs.app/WPrefs.c:790 -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のバージョン情報を読みとれません. 適切にインストールして, そこに " -"PATH を通していることを確認してください" - -#: ../../WPrefs.app/WPrefs.c:797 -#, c-format -msgid "" -"WPrefs only supports Window Maker 0.18.0 or newer.\n" -"The version installed is %i.%i.%i\n" -msgstr "" -"WPrefsはWindow Maker 0.18.0 以降をサポートしています.\n" -"インストールされているのは %i.%i.%i です\n" - -#: ../../WPrefs.app/WPrefs.c:804 -#, c-format -msgid "" -"Window Maker %i.%i.%i, which is installed in your system, is not fully " -"supported by this version of WPrefs." -msgstr "" -"あなたのシステムにインストールされているWindow Maker %i.%i.%i は, " -"Wprefsのこのバージョンでは一部サポートしておりません" - -#: ../../WPrefs.app/Menu.c:1568 ../../WPrefs.app/WPrefs.c:806 -msgid "Warning" -msgstr "警告" - -#: ../../WPrefs.app/WPrefs.c:817 -#, c-format -msgid "could not run \"%s --global_defaults_path\"." -msgstr "\"%s -global_defaults_path\" を実行できません" - -#: ../../WPrefs.app/WPrefs.c:839 -#, c-format -msgid "Could not load global Window Maker domain (%s)." -msgstr "Window Makerのグローバル・ドメイン(%s)を読み込めません" - -#: ../../WPrefs.app/WPrefs.c:1088 -#, c-format -msgid "" -"bad speed value for option %s\n" -". Using default Medium" -msgstr "" -"オプション %s のspeed値は不正です. \n" -"デフォルト値を使用します" - -#: ../../WPrefs.app/Appearance.c:1131 +#: ../../WPrefs.app/Appearance.c:1154 msgid "Select File" msgstr "ファイルの選択" -#: ../../WPrefs.app/Appearance.c:1533 +#: ../../WPrefs.app/Appearance.c:1555 msgid "Focused Window" msgstr "フォーカスウィンドウ" -#: ../../WPrefs.app/Appearance.c:1537 +#: ../../WPrefs.app/Appearance.c:1560 msgid "Unfocused Window" msgstr "フォーカスされてないウィンドウ" -#: ../../WPrefs.app/Appearance.c:1541 +#: ../../WPrefs.app/Appearance.c:1565 msgid "Owner of Focused Window" msgstr "フォーカスウィンドウのオーナー" -#: ../../WPrefs.app/Appearance.c:1545 ../../WPrefs.app/Appearance.c:1862 +#: ../../WPrefs.app/Appearance.c:1570 ../../WPrefs.app/Appearance.c:1893 msgid "Menu Title" msgstr "メニュータイトル" -#: ../../WPrefs.app/Appearance.c:1549 ../../WPrefs.app/Appearance.c:1551 +#: ../../WPrefs.app/Appearance.c:1575 ../../WPrefs.app/Appearance.c:1578 msgid "Normal Item" msgstr "普通の項目" -#: ../../WPrefs.app/Appearance.c:1555 +#: ../../WPrefs.app/Appearance.c:1583 msgid "Disabled Item" msgstr "無効な項目" -#: ../../WPrefs.app/Appearance.c:1564 +#: ../../WPrefs.app/Appearance.c:1595 msgid "Highlighted" msgstr "ハイライト" -#: ../../WPrefs.app/Appearance.c:1755 +#: ../../WPrefs.app/Appearance.c:1786 msgid "Texture" msgstr "テクスチャ" -#: ../../WPrefs.app/Appearance.c:1763 +#: ../../WPrefs.app/Appearance.c:1794 msgid "Titlebar of Focused Window" msgstr "フォーカスウィンドウのタイトルバー" -#: ../../WPrefs.app/Appearance.c:1764 +#: ../../WPrefs.app/Appearance.c:1795 msgid "Titlebar of Unfocused Windows" msgstr "フォーカスのないウィンドウのタイトルバー" -#: ../../WPrefs.app/Appearance.c:1765 +#: ../../WPrefs.app/Appearance.c:1796 msgid "Titlebar of Focused Window's Owner" msgstr "フォーカスウィンドウのオーナーのタイトルバー" -#: ../../WPrefs.app/Appearance.c:1766 +#: ../../WPrefs.app/Appearance.c:1797 msgid "Window Resizebar" msgstr "リサイズバー" -#: ../../WPrefs.app/Appearance.c:1767 +#: ../../WPrefs.app/Appearance.c:1798 msgid "Titlebar of Menus" msgstr "メニューのタイトルバー" -#: ../../WPrefs.app/Appearance.c:1768 +#: ../../WPrefs.app/Appearance.c:1799 msgid "Menu Items" msgstr "メニュー項目" -#: ../../WPrefs.app/Appearance.c:1769 +#: ../../WPrefs.app/Appearance.c:1800 msgid "Icon Background" msgstr "アイコンの背景" -#: ../../WPrefs.app/Appearance.c:1784 +#: ../../WPrefs.app/Appearance.c:1815 msgid "" "Double click in the texture you want to use\n" "for the selected item." @@ -314,108 +90,120 @@ "選択した項目に使用したいテクスチャを\n" "ダブルクリックしてください" -#: ../../WPrefs.app/Appearance.c:1798 +#: ../../WPrefs.app/Appearance.c:1829 msgid "New" msgstr "新規" -#: ../../WPrefs.app/Appearance.c:1802 +#: ../../WPrefs.app/Appearance.c:1833 msgid "Create a new texture." msgstr "新規テクスチャの作成" -#: ../../WPrefs.app/Appearance.c:1810 +#: ../../WPrefs.app/Appearance.c:1841 msgid "Extract..." msgstr "抽出..." -#: ../../WPrefs.app/Appearance.c:1814 +#: ../../WPrefs.app/Appearance.c:1845 msgid "Extract texture(s) from a theme or a style file." msgstr "テーマやスタイルからテクスチャを抽出します" -#: ../../WPrefs.app/Appearance.c:1824 +#: ../../WPrefs.app/Appearance.c:1855 msgid "Edit" msgstr "編集" -#: ../../WPrefs.app/Appearance.c:1827 +#: ../../WPrefs.app/Appearance.c:1858 msgid "Edit the highlighted texture." msgstr "ハイライトされているテクスチャを編集します" -#: ../../WPrefs.app/Appearance.c:1835 ../../WPrefs.app/TexturePanel.c:1317 +#: ../../WPrefs.app/Appearance.c:1866 ../../WPrefs.app/TexturePanel.c:1318 msgid "Delete" msgstr "削除" -#: ../../WPrefs.app/Appearance.c:1839 +#: ../../WPrefs.app/Appearance.c:1870 msgid "Delete the highlighted texture." msgstr "ハイライトされているテクスチャを削除します" -#: ../../WPrefs.app/Appearance.c:1852 +#: ../../WPrefs.app/Appearance.c:1883 msgid "Color" msgstr "色..." -#: ../../WPrefs.app/Appearance.c:1859 +#: ../../WPrefs.app/Appearance.c:1890 msgid "Focused Window Title" msgstr "フォーカスウィンドウのタイトル" -#: ../../WPrefs.app/Appearance.c:1860 +#: ../../WPrefs.app/Appearance.c:1891 msgid "Unfocused Window Title" msgstr "フォーカスされていないウィンドウのタイトル" -#: ../../WPrefs.app/Appearance.c:1861 +#: ../../WPrefs.app/Appearance.c:1892 msgid "Owner of Focused Window Title" msgstr "フォーカスウィンドウのオーナーのタイトル" -#: ../../WPrefs.app/Appearance.c:1863 +#: ../../WPrefs.app/Appearance.c:1894 msgid "Menu Item Text" msgstr "メニュー項目の文字" -#: ../../WPrefs.app/Appearance.c:1864 +#: ../../WPrefs.app/Appearance.c:1895 msgid "Disabled Menu Item Text" msgstr "無効なメニュー項目の文字" -#: ../../WPrefs.app/Appearance.c:1865 +#: ../../WPrefs.app/Appearance.c:1896 msgid "Menu Highlight Color" msgstr "ハイライトされたメニュー項目" -#: ../../WPrefs.app/Appearance.c:1866 +#: ../../WPrefs.app/Appearance.c:1897 msgid "Highlighted Menu Text Color" msgstr "ハイライトされたメニューの文字" -#: ../../WPrefs.app/Appearance.c:1905 +#: ../../WPrefs.app/Appearance.c:1936 msgid "Background" msgstr "背景" -#: ../../WPrefs.app/Appearance.c:1917 ../../WPrefs.app/TexturePanel.c:1504 +#: ../../WPrefs.app/Appearance.c:1948 ../../WPrefs.app/TexturePanel.c:1504 msgid "Browse..." msgstr "参照..." -#: ../../WPrefs.app/Appearance.c:1930 +#: ../../WPrefs.app/Appearance.c:1961 msgid "Options" msgstr "オプション" -#: ../../WPrefs.app/Appearance.c:1937 +#: ../../WPrefs.app/Appearance.c:1968 msgid "Menu Style" msgstr "メニューのスタイル" -#: ../../WPrefs.app/Appearance.c:1979 +#: ../../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:546 +#: ../../WPrefs.app/WPrefs.c:571 +#, c-format +msgid "could not load icon file %s" +msgstr "アイコン %s がロードできません" + +#: ../../WPrefs.app/Appearance.c:2010 msgid "Title Alignment" msgstr "タイトルの配置" -#: ../../WPrefs.app/Appearance.c:1986 +#: ../../WPrefs.app/Appearance.c:2017 msgid "Left" msgstr "左" -#: ../../WPrefs.app/Appearance.c:1989 ../../WPrefs.app/TexturePanel.c:1518 +#: ../../WPrefs.app/Appearance.c:2020 ../../WPrefs.app/TexturePanel.c:1518 #: ../../WPrefs.app/Workspace.c:270 msgid "Center" msgstr "中央" -#: ../../WPrefs.app/Appearance.c:1992 +#: ../../WPrefs.app/Appearance.c:2023 msgid "Right" msgstr "右" -#: ../../WPrefs.app/Appearance.c:2216 +#: ../../WPrefs.app/Appearance.c:2247 msgid "Appearance Preferences" -msgstr "外観の設定" +msgstr "外観の設定 " -#: ../../WPrefs.app/Appearance.c:2218 +#: ../../WPrefs.app/Appearance.c:2249 msgid "" "Background texture configuration for windows,\n" "menus and icons." @@ -423,15 +211,19 @@ "ウィンドウ・メニュー・アイコンの\n" "背景やテクスチャを設定します" -#: ../../WPrefs.app/Appearance.c:2263 +#: ../../WPrefs.app/Appearance.c:2294 msgid "Extract Texture" msgstr "テクスチャの抽出" -#: ../../WPrefs.app/Appearance.c:2283 +#: ../../WPrefs.app/Appearance.c:2314 msgid "Textures" msgstr "テクスチャ" -#: ../../WPrefs.app/Appearance.c:2299 +#: ../../WPrefs.app/Appearance.c:2325 ../../WPrefs.app/WPrefs.c:301 +msgid "Close" +msgstr "閉じる" + +#: ../../WPrefs.app/Appearance.c:2330 msgid "Extract" msgstr "抽出" @@ -446,26 +238,26 @@ #: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109 #, c-format msgid "could not process icon %s:" -msgstr "アイコン %s を処理できません:" +msgstr "アイコン %s を処理できません" -#: ../../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 "イメージファイル %s がロードできません" +msgstr "画像ファイル %s がロードできません" -#: ../../WPrefs.app/Configurations.c:203 +#: ../../WPrefs.app/Configurations.c:202 msgid "Icon Slide Speed" msgstr "アイコン移動速度" -#: ../../WPrefs.app/Configurations.c:209 +#: ../../WPrefs.app/Configurations.c:208 msgid "Shade Animation Speed" msgstr "シェードアニメーション速度" -#: ../../WPrefs.app/Configurations.c:271 +#: ../../WPrefs.app/Configurations.c:270 msgid "Smooth Scaling" msgstr "滑らかな表示" -#: ../../WPrefs.app/Configurations.c:272 +#: ../../WPrefs.app/Configurations.c:271 msgid "" "Smooth scaled background images, neutralizing\n" "the `pixelization' effect. This will slow\n" @@ -474,21 +266,19 @@ "背景を滑らかにしてピクセルを目立たなくします.\n" "画像の読み込みがいささか遅くなるかもしれません" -#: ../../WPrefs.app/Configurations.c:313 +#: ../../WPrefs.app/Configurations.c:312 msgid "Titlebar Style" msgstr "タイトルバー" -# msgstr "タイトルバーのスタイル" -#: ../../WPrefs.app/Configurations.c:351 +#: ../../WPrefs.app/Configurations.c:350 msgid "Animations and Sound" msgstr "アニメーションとサウンド" -#: ../../WPrefs.app/Configurations.c:357 +#: ../../WPrefs.app/Configurations.c:356 msgid "Animations" msgstr "アニメ" -# msgstr "アニメーション" -#: ../../WPrefs.app/Configurations.c:368 +#: ../../WPrefs.app/Configurations.c:367 msgid "" "Disable/enable animations such as those shown\n" "for window miniaturization, shading etc." @@ -496,11 +286,11 @@ "ウィンドウの最小化やシェードのときのアニメ表示\n" "を有効化/無効化します" -#: ../../WPrefs.app/Configurations.c:376 +#: ../../WPrefs.app/Configurations.c:375 msgid "Superfluous" msgstr "特殊効果" -#: ../../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" @@ -511,25 +301,25 @@ "します. ドックアイコンの移動時の影表示や\n" "ドック解除のときの爆発などがこれです." -#: ../../WPrefs.app/Configurations.c:397 +#: ../../WPrefs.app/Configurations.c:396 msgid "Sounds" msgstr "サウンド" -#: ../../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 "" "ウィンドウのクローズやシェードのアクションにつける\n" "サウンド効果を有効化/無効化します. この機能には\n" "別配布のモジュールを用意する必要があります.\n" "こちらをご覧ください:\n" -"http://shadowmere.student.utwente.nl/" +"http://largo.windowmaker.org/files.php#WSoundServer" -#: ../../WPrefs.app/Configurations.c:419 +#: ../../WPrefs.app/Configurations.c:418 msgid "" "Note: sound requires a module distributed\n" "separately" @@ -537,11 +327,11 @@ "※サウンド機能には別途モジュール\n" "を用意する必要があります" -#: ../../WPrefs.app/Configurations.c:429 +#: ../../WPrefs.app/Configurations.c:428 msgid "Dithering colormap for 8bpp" msgstr "8bppに合わせた減色" -#: ../../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)." @@ -549,11 +339,11 @@ "8bpp しか対応していないディスプレイのときに\n" "Window Maker に予約する色の数" -#: ../../WPrefs.app/Configurations.c:438 +#: ../../WPrefs.app/Configurations.c:437 msgid "Disable dithering in any visual/depth" msgstr "全ての色深度で減色を行わない" -#: ../../WPrefs.app/Configurations.c:459 +#: ../../WPrefs.app/Configurations.c:458 msgid "" "More colors for\n" "applications" @@ -561,19 +351,19 @@ "アプリに\n" "もっと色を" -#: ../../WPrefs.app/Configurations.c:466 +#: ../../WPrefs.app/Configurations.c:465 msgid "" "More colors for\n" "Window Maker" msgstr "" -"Window Maker\n" -"にもっと色を" +"Window Makerに\n" +"もっと色を" -#: ../../WPrefs.app/Configurations.c:521 +#: ../../WPrefs.app/Configurations.c:520 msgid "Other Configurations" -msgstr "その他の設定" +msgstr "その他の設定 " -#: ../../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" @@ -585,7 +375,7 @@ #: ../../WPrefs.app/Expert.c:75 msgid "" -"Disable miniwindows (icons for miniaturized windows). For use with KDE/GNOME." +"Disable miniwindows (icons for minimized windows). For use with KDE/GNOME." msgstr "ミニウィンドウ(最小化時のアイコン表示)の無効化. KDE/GNOME 向け." #: ../../WPrefs.app/Expert.c:76 @@ -594,29 +384,29 @@ #: ../../WPrefs.app/Expert.c:77 msgid "Automatically save session when exiting Window Maker." -msgstr "Window Maker終了時に自動的にセッションを保存" +msgstr "Window Maker終了時に自動的にセッションを保存する" #: ../../WPrefs.app/Expert.c:78 msgid "Use SaveUnder in window frames, icons, menus and other objects." msgstr "各ウィンドウ, アイコン, メニュー等の画像をメモリーに保持する" #: ../../WPrefs.app/Expert.c:79 -msgid "Use Windoze style cycling." -msgstr "某Windows風なサイクル動作" - -#: ../../WPrefs.app/Expert.c:80 msgid "Disable confirmation panel for the Kill command." msgstr "強制終了時の確認パネルを表示しない" -#: ../../WPrefs.app/Expert.c:81 +#: ../../WPrefs.app/Expert.c:80 msgid "Disable selection animation for selected icons." -msgstr "選択されたアイコンのアニメーションによる強調を中止" +msgstr "選択されたアイコンのアニメーションによる強調をしない" -#: ../../WPrefs.app/Expert.c:115 -msgid "Expert User Preferences" -msgstr "エキスパート設定" +#: ../../WPrefs.app/Expert.c:81 +msgid "Smooth font edges (needs restart)." +msgstr "フォントのふちを滑らかにする (要 再起動)" #: ../../WPrefs.app/Expert.c:117 +msgid "Expert User Preferences" +msgstr "エキスパート設定 " + +#: ../../WPrefs.app/Expert.c:119 msgid "" "Options for people who know what they're doing...\n" "Also have some other misc. options." @@ -624,71 +414,62 @@ "何をやってるかわかってる人のためのオプション...\n" "雑多なオプションも含みます." -#: ../../WPrefs.app/Focus.c:81 +#: ../../WPrefs.app/Focus.c:80 #, c-format msgid "bad option value %s for option FocusMode. Using default Manual" msgstr "" "フォーカスモードオプション %s が不適切です. デフォルト値 手動 を使います" -#: ../../WPrefs.app/Focus.c:95 +#: ../../WPrefs.app/Focus.c:94 #, c-format msgid "bad option value %s for option ColormapMode. Using default Auto" msgstr "カラーマップオプション %s が不適切です. デフォルト値 自動 を使います" -#: ../../WPrefs.app/Focus.c:215 +#: ../../WPrefs.app/Focus.c:214 msgid "Input Focus Mode" msgstr "インプット・フォーカスの設定" -#: ../../WPrefs.app/Focus.c:223 -msgid "Manual: Click on the window to set keyboard input focus" -msgstr "手動： ウィンドウ上でクリックして インプット・フォーカスを移動" - -#: ../../WPrefs.app/Focus.c:230 -msgid "Auto: Set keyboard input focus to the window under the mouse pointer" -msgstr "自動： マウスカーソルがあるウィンドウに インプット・フォーカスを移動" +#: ../../WPrefs.app/Focus.c:222 +msgid "Manual: Click on the window to set keyboard input focus." +msgstr "手動：フォーカスする ウィンドウ上でクリックする" + +#: ../../WPrefs.app/Focus.c:229 +msgid "Auto: Set keyboard input focus to the window under the mouse pointer." +msgstr "自動：マウスポインタで 自動的にフォーカスを取得" -#: ../../WPrefs.app/Focus.c:244 +#: ../../WPrefs.app/Focus.c:243 msgid "Install colormap in the window..." -msgstr "カラーマップのウィンドウへの設定..." +msgstr "カラーマップのウィンドウへの設定は..." -#: ../../WPrefs.app/Focus.c:249 +#: ../../WPrefs.app/Focus.c:248 msgid "...that has the input focus." msgstr "...フォーカスが移動した時に" -#: ../../WPrefs.app/Focus.c:254 -msgid "...that is under the mouse pointer." -msgstr "...マウスカーソルの下にある時" +#: ../../WPrefs.app/Focus.c:253 +msgid "...that's under the mouse pointer." +msgstr "...マウスポインタがある時に" -#: ../../WPrefs.app/Focus.c:263 +#: ../../WPrefs.app/Focus.c:262 msgid "Automatic Window Raise Delay" msgstr "自動的に前面へ出すまでに" -#: ../../WPrefs.app/Focus.c:320 ../../WPrefs.app/MouseSettings.c:601 +#: ../../WPrefs.app/Focus.c:319 ../../WPrefs.app/MouseSettings.c:601 msgid "msec" msgstr "msec" -#: ../../WPrefs.app/Focus.c:337 -msgid "" -"Do not let applications receive\n" -"the click used to focus windows." -msgstr "" -"フォーカス移動のためのマウ\n" -"スクリックをアプリケーショ\n" -"ンに渡さない" - -#: ../../WPrefs.app/Focus.c:343 -msgid "" -"Automatically focus new\n" -"windows." -msgstr "" -"フォーカスを自動的に新しい\n" -"ウィンドウに移動" +#: ../../WPrefs.app/Focus.c:336 +msgid "Do not let applications receive the click used to focus windows." +msgstr "フォーカス移動のためのマウスクリックをアプリケーションに渡さない." + +#: ../../WPrefs.app/Focus.c:342 +msgid "Automatically focus new windows." +msgstr "フォーカスを自動的に 新しいウィンドウに移動" -#: ../../WPrefs.app/Focus.c:364 +#: ../../WPrefs.app/Focus.c:363 msgid "Window Focus Preferences" -msgstr "ウィンドウフォーカスの設定" +msgstr "ウィンドウフォーカスの設定 " -#: ../../WPrefs.app/Focus.c:366 +#: ../../WPrefs.app/Focus.c:365 msgid "" "Keyboard focus switching policy, colormap switching\n" "policy for 8bpp displays and other related options." @@ -696,54 +477,49 @@ "キーボードでのフォーカス切り替えポリシー, \n" "8bpp 画面用のカラーマップ切り替えポリシー, その他" -#: ../../WPrefs.app/Font.c:277 -msgid "Could not locate font information file WPrefs.app/font.data" -msgstr "フォント情報ファイル WPrefs.app/font.data が見つかりません" +#: ../../WPrefs.app/FontSimple.c:106 +msgid "Window Title" +msgstr "ウィンドウタイトル" -#: ../../WPrefs.app/Font.c:283 -msgid "Could not read font information file WPrefs.app/font.data" -msgstr "フォント情報ファイル WPrefs.app/font.data が読み込めません" +#: ../../WPrefs.app/FontSimple.c:108 +msgid "Menu Text" +msgstr "メニュー項目" -#: ../../WPrefs.app/Font.c:294 -msgid "" -"Invalid data in font information file WPrefs.app/font.data.\n" -"Encodings data not found." -msgstr "" -"フォント情報ファイル WPrefs.app/font.data の内容が不正です.\n" -"エンコードデータがありません" +#: ../../WPrefs.app/FontSimple.c:109 +msgid "Icon Title" +msgstr "アイコンタイトル" -#: ../../WPrefs.app/Font.c:299 -msgid "- Custom -" -msgstr "- カスタム -" +#: ../../WPrefs.app/FontSimple.c:110 +msgid "Clip Title" +msgstr "クリップタイトル" -#: ../../WPrefs.app/Font.c:376 -msgid "Default Font Sets" -msgstr "デフォルトフォント" +#: ../../WPrefs.app/FontSimple.c:111 +msgid "Desktop Caption" +msgstr "デスクトップ名" -#: ../../WPrefs.app/Font.c:389 -msgid "Font Set" -msgstr "フォントセット" +#: ../../WPrefs.app/FontSimple.c:689 +msgid "Sample Text" +msgstr "サンプル" -#: ../../WPrefs.app/Font.c:418 -msgid "Add..." -msgstr "追加..." +#: ../../WPrefs.app/FontSimple.c:707 +msgid "Family" +msgstr "" -#: ../../WPrefs.app/Font.c:423 ../../WPrefs.app/Font.c:438 -msgid "Change..." -msgstr "変更..." +#: ../../WPrefs.app/FontSimple.c:736 +msgid "Style" +msgstr "" -#: ../../WPrefs.app/Font.c:428 ../../WPrefs.app/Paths.c:288 -#: ../../WPrefs.app/Paths.c:319 -msgid "Remove" -msgstr "削除" +#: ../../WPrefs.app/FontSimple.c:739 +msgid "Size" +msgstr "" + +#: ../../WPrefs.app/FontSimple.c:777 +msgid "Font Configuration" +msgstr "フォントの設定 " -#: ../../WPrefs.app/Font.c:477 -msgid "Font Preferences" -msgstr "フォント設定" - -#: ../../WPrefs.app/Font.c:478 -msgid "Font Configurations for Windows, Menus etc" -msgstr "ウィンドウやメニューなどのフォント設定" +#: ../../WPrefs.app/FontSimple.c:779 +msgid "Configure fonts for Window Maker titlebars, menus etc." +msgstr "タイトルバーやメニューに使うフォントの設定" #: ../../WPrefs.app/Icons.c:180 msgid "Icon Positioning" @@ -796,7 +572,7 @@ #: ../../WPrefs.app/Icons.c:345 msgid "Icon Preferences" -msgstr "アイコンの設定" +msgstr "アイコンの設定 " #: ../../WPrefs.app/Icons.c:347 msgid "" @@ -826,230 +602,250 @@ msgid "Not done" msgstr "まだ" -#: ../../WPrefs.app/KeyboardShortcuts.c:186 ../../WPrefs.app/Menu.c:327 -#: ../../WPrefs.app/TexturePanel.c:1535 +#: ../../WPrefs.app/KeyboardShortcuts.c:310 ../../WPrefs.app/Menu.c:360 +#: ../../WPrefs.app/TexturePanel.c:1535 ../../WPrefs.app/imagebrowser.c:100 msgid "Cancel" msgstr "キャンセル" -#: ../../WPrefs.app/KeyboardShortcuts.c:187 +#: ../../WPrefs.app/KeyboardShortcuts.c:311 msgid "Press the desired shortcut key(s) or click Cancel to stop capturing." msgstr "設定したいショートカットキーを押してください. (中断ボタンで中止)" -#: ../../WPrefs.app/KeyboardShortcuts.c:207 -#: ../../WPrefs.app/KeyboardShortcuts.c:456 ../../WPrefs.app/Menu.c:338 -#: ../../WPrefs.app/Menu.c:782 +#: ../../WPrefs.app/KeyboardShortcuts.c:331 +#: ../../WPrefs.app/KeyboardShortcuts.c:584 ../../WPrefs.app/Menu.c:371 +#: ../../WPrefs.app/Menu.c:830 msgid "Capture" msgstr "取り込み" -#: ../../WPrefs.app/KeyboardShortcuts.c:208 -#: ../../WPrefs.app/KeyboardShortcuts.c:464 -msgid "Click Capture to interactively define the shortcut key." +#: ../../WPrefs.app/KeyboardShortcuts.c:332 +#: ../../WPrefs.app/KeyboardShortcuts.c:592 +msgid "Click on Capture to interactively define the shortcut key." msgstr "" "ショートカットを対話的\n" "に定義するには取り込み\n" "をクリックして下さい" -#: ../../WPrefs.app/KeyboardShortcuts.c:363 +#: ../../WPrefs.app/KeyboardShortcuts.c:486 msgid "Actions" msgstr "アクション" -#: ../../WPrefs.app/KeyboardShortcuts.c:379 +#: ../../WPrefs.app/KeyboardShortcuts.c:500 msgid "Open applications menu" msgstr "アプリケーション・メニューを開く" -#: ../../WPrefs.app/KeyboardShortcuts.c:380 +#: ../../WPrefs.app/KeyboardShortcuts.c:501 msgid "Open window list menu" msgstr "ウィンドウリスト・メニューを開く" -#: ../../WPrefs.app/KeyboardShortcuts.c:381 +#: ../../WPrefs.app/KeyboardShortcuts.c:502 msgid "Open window commands menu" msgstr "ウィンドウコマンド・メニューを開く" -#: ../../WPrefs.app/KeyboardShortcuts.c:382 +#: ../../WPrefs.app/KeyboardShortcuts.c:503 msgid "Hide active application" msgstr "アクティブ・アプリケーションを隠す" -#: ../../WPrefs.app/KeyboardShortcuts.c:383 +#: ../../WPrefs.app/KeyboardShortcuts.c:504 +msgid "Hide other applications" +msgstr "他のアプリケーションを隠す" + +#: ../../WPrefs.app/KeyboardShortcuts.c:505 msgid "Miniaturize active window" msgstr "アクティブ・ウィンドウを最小化" -#: ../../WPrefs.app/KeyboardShortcuts.c:384 +#: ../../WPrefs.app/KeyboardShortcuts.c:506 msgid "Close active window" msgstr "アクティブ・ウィンドウを閉じる" -#: ../../WPrefs.app/KeyboardShortcuts.c:385 +#: ../../WPrefs.app/KeyboardShortcuts.c:507 msgid "Maximize active window" msgstr "アクティブ・ウィンドウを最大化" -#: ../../WPrefs.app/KeyboardShortcuts.c:386 +#: ../../WPrefs.app/KeyboardShortcuts.c:508 msgid "Maximize active window vertically" msgstr "ウィンドウを縦方向に最大化" -#: ../../WPrefs.app/KeyboardShortcuts.c:387 +#: ../../WPrefs.app/KeyboardShortcuts.c:509 msgid "Maximize active window horizontally" msgstr "ウィンドウを横方向に最大化" -#: ../../WPrefs.app/KeyboardShortcuts.c:388 +#: ../../WPrefs.app/KeyboardShortcuts.c:510 msgid "Raise active window" msgstr "アクティブ・ウィンドウを前面に" -#: ../../WPrefs.app/KeyboardShortcuts.c:389 +#: ../../WPrefs.app/KeyboardShortcuts.c:511 msgid "Lower active window" msgstr "アクティブ・ウィンドウを背面に" -#: ../../WPrefs.app/KeyboardShortcuts.c:390 +#: ../../WPrefs.app/KeyboardShortcuts.c:512 msgid "Raise/Lower window under mouse pointer" msgstr "マウスポインタ下のウィンドウを前/背面へ" -#: ../../WPrefs.app/KeyboardShortcuts.c:391 +#: ../../WPrefs.app/KeyboardShortcuts.c:513 msgid "Shade active window" msgstr "アクティブ・ウィンドウを畳む" -#: ../../WPrefs.app/KeyboardShortcuts.c:392 +#: ../../WPrefs.app/KeyboardShortcuts.c:514 msgid "Move/Resize active window" msgstr "アクティブ・ウィンドウの移動/拡大縮小" -#: ../../WPrefs.app/KeyboardShortcuts.c:393 +#: ../../WPrefs.app/KeyboardShortcuts.c:515 msgid "Select active window" msgstr "アクティブ・ウィンドウの選択" -#: ../../WPrefs.app/KeyboardShortcuts.c:394 +#: ../../WPrefs.app/KeyboardShortcuts.c:516 msgid "Focus next window" msgstr "フォーカスを次のウィンドウへ" -#: ../../WPrefs.app/KeyboardShortcuts.c:395 +#: ../../WPrefs.app/KeyboardShortcuts.c:517 msgid "Focus previous window" msgstr "フォーカスを前のウィンドウへ" -#: ../../WPrefs.app/KeyboardShortcuts.c:396 +#: ../../WPrefs.app/KeyboardShortcuts.c:518 msgid "Switch to next workspace" msgstr "次のワークスペースへ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:397 +#: ../../WPrefs.app/KeyboardShortcuts.c:519 msgid "Switch to previous workspace" msgstr "前のワークスペースへ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:398 +#: ../../WPrefs.app/KeyboardShortcuts.c:520 msgid "Switch to next ten workspaces" msgstr "10個先ののワークスペースへ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:399 +#: ../../WPrefs.app/KeyboardShortcuts.c:521 msgid "Switch to previous ten workspaces" msgstr "10個手前のワークスペースへ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:400 +#: ../../WPrefs.app/KeyboardShortcuts.c:522 msgid "Switch to workspace 1" msgstr "ワークスペース1へ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:401 +#: ../../WPrefs.app/KeyboardShortcuts.c:523 msgid "Switch to workspace 2" msgstr "ワークスペース2へ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:402 +#: ../../WPrefs.app/KeyboardShortcuts.c:524 msgid "Switch to workspace 3" msgstr "ワークスペース3へ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:403 +#: ../../WPrefs.app/KeyboardShortcuts.c:525 msgid "Switch to workspace 4" msgstr "ワークスペース4へ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:404 +#: ../../WPrefs.app/KeyboardShortcuts.c:526 msgid "Switch to workspace 5" msgstr "ワークスペース5へ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:405 +#: ../../WPrefs.app/KeyboardShortcuts.c:527 msgid "Switch to workspace 6" msgstr "ワークスペース6へ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:406 +#: ../../WPrefs.app/KeyboardShortcuts.c:528 msgid "Switch to workspace 7" msgstr "ワークスペース7へ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:407 +#: ../../WPrefs.app/KeyboardShortcuts.c:529 msgid "Switch to workspace 8" msgstr "ワークスペース8へ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:408 +#: ../../WPrefs.app/KeyboardShortcuts.c:530 msgid "Switch to workspace 9" msgstr "ワークスペース9へ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:409 +#: ../../WPrefs.app/KeyboardShortcuts.c:531 msgid "Switch to workspace 10" msgstr "ワークスペース10へ移動" -#: ../../WPrefs.app/KeyboardShortcuts.c:410 +#: ../../WPrefs.app/KeyboardShortcuts.c:532 msgid "Shortcut for window 1" msgstr "ウィンドウ1へのショートカット" -#: ../../WPrefs.app/KeyboardShortcuts.c:411 +#: ../../WPrefs.app/KeyboardShortcuts.c:533 msgid "Shortcut for window 2" msgstr "ウィンドウ2へのショートカット" -#: ../../WPrefs.app/KeyboardShortcuts.c:412 +#: ../../WPrefs.app/KeyboardShortcuts.c:534 msgid "Shortcut for window 3" msgstr "ウィンドウ3へのショートカット" -#: ../../WPrefs.app/KeyboardShortcuts.c:413 +#: ../../WPrefs.app/KeyboardShortcuts.c:535 msgid "Shortcut for window 4" msgstr "ウィンドウ4へのショートカット" -#: ../../WPrefs.app/KeyboardShortcuts.c:414 +#: ../../WPrefs.app/KeyboardShortcuts.c:536 msgid "Shortcut for window 5" msgstr "ウィンドウ5へのショートカット" -#: ../../WPrefs.app/KeyboardShortcuts.c:415 +#: ../../WPrefs.app/KeyboardShortcuts.c:537 msgid "Shortcut for window 6" msgstr "ウィンドウ6へのショートカット" -#: ../../WPrefs.app/KeyboardShortcuts.c:416 +#: ../../WPrefs.app/KeyboardShortcuts.c:538 msgid "Shortcut for window 7" msgstr "ウィンドウ7へのショートカット" -#: ../../WPrefs.app/KeyboardShortcuts.c:417 +#: ../../WPrefs.app/KeyboardShortcuts.c:539 msgid "Shortcut for window 8" msgstr "ウィンドウ8へのショートカット" -#: ../../WPrefs.app/KeyboardShortcuts.c:418 +#: ../../WPrefs.app/KeyboardShortcuts.c:540 msgid "Shortcut for window 9" msgstr "ウィンドウ9へのショートカット" -#: ../../WPrefs.app/KeyboardShortcuts.c:419 +#: ../../WPrefs.app/KeyboardShortcuts.c:541 msgid "Shortcut for window 10" msgstr "ウィンドウ10へのショートカット" -#: ../../WPrefs.app/KeyboardShortcuts.c:420 +#: ../../WPrefs.app/KeyboardShortcuts.c:542 msgid "Switch to Next Screen/Monitor" msgstr "次のスクリーン/モニタへ" -#: ../../WPrefs.app/KeyboardShortcuts.c:421 +#: ../../WPrefs.app/KeyboardShortcuts.c:544 +msgid "Move VirtualDesktop to next left edge" +msgstr "仮想デスクトップを次の左側境界へ" + +#: ../../WPrefs.app/KeyboardShortcuts.c:545 +msgid "Move VirtualDesktop to next right edge" +msgstr "仮想デスクトップを次の右側境界へ" + +#: ../../WPrefs.app/KeyboardShortcuts.c:546 +msgid "Move VirtualDesktop to next top edge" +msgstr "仮想デスクトップを次の上側境界へ" + +#: ../../WPrefs.app/KeyboardShortcuts.c:547 +msgid "Move VirtualDesktop to next bottom edge" +msgstr "仮想デスクトップを次の下側境界へ" + +#: ../../WPrefs.app/KeyboardShortcuts.c:549 msgid "Raise Clip" msgstr "クリップを前面に" -#: ../../WPrefs.app/KeyboardShortcuts.c:422 +#: ../../WPrefs.app/KeyboardShortcuts.c:550 msgid "Lower Clip" msgstr "クリップを背面に" -#: ../../WPrefs.app/KeyboardShortcuts.c:423 +#: ../../WPrefs.app/KeyboardShortcuts.c:551 msgid "Raise/Lower Clip" msgstr "クリップを前/背面に" -#: ../../WPrefs.app/KeyboardShortcuts.c:425 +#: ../../WPrefs.app/KeyboardShortcuts.c:553 msgid "Toggle keyboard language" msgstr "キーボードの言語切替え" -#: ../../WPrefs.app/KeyboardShortcuts.c:439 +#: ../../WPrefs.app/KeyboardShortcuts.c:567 msgid "Shortcut" msgstr "ショートカット" -#: ../../WPrefs.app/KeyboardShortcuts.c:450 ../../WPrefs.app/Menu.c:788 +#: ../../WPrefs.app/KeyboardShortcuts.c:578 ../../WPrefs.app/Menu.c:836 msgid "Clear" msgstr "クリア" -#: ../../WPrefs.app/KeyboardShortcuts.c:512 +#: ../../WPrefs.app/KeyboardShortcuts.c:640 msgid "Keyboard Shortcut Preferences" -msgstr "キーボードショートカットの設定" +msgstr "キーボードショートカットの設定 " -#: ../../WPrefs.app/KeyboardShortcuts.c:514 +#: ../../WPrefs.app/KeyboardShortcuts.c:642 msgid "" "Change the keyboard shortcuts for actions such\n" "as changing workspaces and opening menus." @@ -1057,171 +853,184 @@ "ワークスペースの変更やメニュー操作の\n" "キーボードショートカット動作を設定します" -#: ../../WPrefs.app/Menu.c:477 +#: ../../WPrefs.app/Menu.c:278 +msgid "Select Program" +msgstr "プログラム選択" + +#: ../../WPrefs.app/Menu.c:510 msgid "New Items" msgstr "新規" -#: ../../WPrefs.app/Menu.c:478 +#: ../../WPrefs.app/Menu.c:511 msgid "Sample Commands" msgstr "サンプルコマンド" -#: ../../WPrefs.app/Menu.c:479 +#: ../../WPrefs.app/Menu.c:512 msgid "Sample Submenus" msgstr "サンプルサブメニュー" -#: ../../WPrefs.app/Menu.c:493 +#: ../../WPrefs.app/Menu.c:526 msgid "Run Program" msgstr "プログラム実行" -#: ../../WPrefs.app/Menu.c:494 +#: ../../WPrefs.app/Menu.c:527 msgid "Internal Command" msgstr "内部コマンド" -#: ../../WPrefs.app/Menu.c:495 +#: ../../WPrefs.app/Menu.c:528 msgid "Submenu" msgstr "サブメニュー" -#: ../../WPrefs.app/Menu.c:496 +#: ../../WPrefs.app/Menu.c:529 msgid "External Submenu" msgstr "外部サブメニュー" -#: ../../WPrefs.app/Menu.c:497 +#: ../../WPrefs.app/Menu.c:530 msgid "Generated Submenu" msgstr "自動生成のサブメニュー" -#: ../../WPrefs.app/Menu.c:498 +#: ../../WPrefs.app/Menu.c:531 msgid "Directory Contents" msgstr "ディレクトリの内容" -#: ../../WPrefs.app/Menu.c:499 +#: ../../WPrefs.app/Menu.c:532 msgid "Workspace Menu" msgstr "ワークスペースメニュー" -#: ../../WPrefs.app/Menu.c:500 ../../WPrefs.app/MouseSettings.c:840 +#: ../../WPrefs.app/Menu.c:533 ../../WPrefs.app/MouseSettings.c:840 msgid "Window List Menu" msgstr "ウィンドウ一覧メニュー" -#: ../../WPrefs.app/Menu.c:519 +#: ../../WPrefs.app/Menu.c:552 msgid "XTerm" msgstr "" -#: ../../WPrefs.app/Menu.c:522 +#: ../../WPrefs.app/Menu.c:555 msgid "rxvt" msgstr "" -#: ../../WPrefs.app/Menu.c:525 +#: ../../WPrefs.app/Menu.c:558 msgid "ETerm" msgstr "" -#: ../../WPrefs.app/Menu.c:528 +#: ../../WPrefs.app/Menu.c:561 msgid "Run..." -msgstr "起動..." +msgstr "実行..." -#: ../../WPrefs.app/Menu.c:531 +#: ../../WPrefs.app/Menu.c:562 +#, c-format +msgid "%a(Run,Type command to run)" +msgstr "%a (実行するコマンドを入力)" + +#: ../../WPrefs.app/Menu.c:564 msgid "Netscape" msgstr "" -#: ../../WPrefs.app/Menu.c:534 +#: ../../WPrefs.app/Menu.c:567 msgid "gimp" msgstr "" -#: ../../WPrefs.app/Menu.c:537 +#: ../../WPrefs.app/Menu.c:570 msgid "epic" msgstr "" -#: ../../WPrefs.app/Menu.c:540 +#: ../../WPrefs.app/Menu.c:573 msgid "ee" msgstr "" -#: ../../WPrefs.app/Menu.c:543 +#: ../../WPrefs.app/Menu.c:576 msgid "xv" msgstr "" -#: ../../WPrefs.app/Menu.c:546 +#: ../../WPrefs.app/Menu.c:579 msgid "Acrobat Reader" msgstr "" -#: ../../WPrefs.app/Menu.c:549 +#: ../../WPrefs.app/Menu.c:582 msgid "ghostview" msgstr "" -#: ../../WPrefs.app/Menu.c:552 ../../WPrefs.app/Menu.c:809 +#: ../../WPrefs.app/Menu.c:585 ../../WPrefs.app/Menu.c:857 msgid "Exit Window Maker" -msgstr "Window Makerを終了" +msgstr "Window Maker を終了" -#: ../../WPrefs.app/Menu.c:575 +#: ../../WPrefs.app/Menu.c:608 msgid "Debian Menu" msgstr "" -#: ../../WPrefs.app/Menu.c:578 +#: ../../WPrefs.app/Menu.c:611 msgid "RedHat Menu" msgstr "" -#: ../../WPrefs.app/Menu.c:581 +#: ../../WPrefs.app/Menu.c:614 msgid "Menu Conectiva" msgstr "" -#: ../../WPrefs.app/Menu.c:584 ../../WPrefs.app/Themes.c:250 +#: ../../WPrefs.app/Menu.c:617 ../../WPrefs.app/Themes.c:250 msgid "Themes" msgstr "テーマ" -#: ../../WPrefs.app/Menu.c:589 +#: ../../WPrefs.app/Menu.c:622 msgid "Bg Images (scale)" msgstr "背景(拡大/縮小)" -#: ../../WPrefs.app/Menu.c:594 +#: ../../WPrefs.app/Menu.c:627 msgid "Bg Images (tile)" msgstr "背景(しきつめる)" -#: ../../WPrefs.app/Menu.c:599 +#: ../../WPrefs.app/Menu.c:632 msgid "Assorted XTerms" msgstr "" -#: ../../WPrefs.app/Menu.c:601 +#: ../../WPrefs.app/Menu.c:634 msgid "XTerm Yellow on Blue" msgstr "" -#: ../../WPrefs.app/Menu.c:604 +#: ../../WPrefs.app/Menu.c:637 msgid "XTerm White on Black" msgstr "" -#: ../../WPrefs.app/Menu.c:607 +#: ../../WPrefs.app/Menu.c:640 msgid "XTerm Black on White" msgstr "" -#: ../../WPrefs.app/Menu.c:610 +#: ../../WPrefs.app/Menu.c:643 msgid "XTerm Black on Beige" msgstr "" -#: ../../WPrefs.app/Menu.c:613 +#: ../../WPrefs.app/Menu.c:646 msgid "XTerm White on Green" msgstr "" -#: ../../WPrefs.app/Menu.c:616 +#: ../../WPrefs.app/Menu.c:649 msgid "XTerm White on Olive" msgstr "" -#: ../../WPrefs.app/Menu.c:619 +#: ../../WPrefs.app/Menu.c:652 msgid "XTerm Blue on Blue" msgstr "" -#: ../../WPrefs.app/Menu.c:622 +#: ../../WPrefs.app/Menu.c:655 msgid "XTerm BIG FONTS" msgstr "" -#: ../../WPrefs.app/Menu.c:644 +#: ../../WPrefs.app/Menu.c:677 msgid "Program to Run" msgstr "実行するプログラム" -#: ../../WPrefs.app/Menu.c:658 +#: ../../WPrefs.app/Menu.c:687 +msgid "Browse" +msgstr "参照" + +#: ../../WPrefs.app/Menu.c:698 msgid "Run the program inside a Xterm" msgstr "" -#: ../../WPrefs.app/Menu.c:668 +#: ../../WPrefs.app/Menu.c:708 msgid "Path for Menu" msgstr "メニューパス" -#: ../../WPrefs.app/Menu.c:681 +#: ../../WPrefs.app/Menu.c:721 msgid "" "Enter the path for a file containing a menu\n" "or a list of directories with the programs you\n" @@ -1237,11 +1046,11 @@ "とか, \n" "/usr/X11R6/bin ~/xbin" -#: ../../WPrefs.app/Menu.c:696 +#: ../../WPrefs.app/Menu.c:736 msgid "Command" msgstr "コマンド" -#: ../../WPrefs.app/Menu.c:710 +#: ../../WPrefs.app/Menu.c:750 msgid "" "Enter a command that outputs a menu\n" "definition to stdout when invoked." @@ -1249,11 +1058,19 @@ "メニュー定義を出力するコマンドを\n" "入力してください" -#: ../../WPrefs.app/Menu.c:721 +#: ../../WPrefs.app/Menu.c:758 +msgid "" +"Cache menu contents after opening for\n" +"the first time" +msgstr "" +"初回ロード時にメニューの内容を\n" +"キャッシュする" + +#: ../../WPrefs.app/Menu.c:769 msgid "Command to Open Files" msgstr "ファイルを開くコマンド" -#: ../../WPrefs.app/Menu.c:735 +#: ../../WPrefs.app/Menu.c:783 msgid "" "Enter the command you want to use to open the\n" "files in the directories listed below." @@ -1261,71 +1078,71 @@ "これらのディレクトリにあるファイルを開くときに\n" "使用するコマンドを入力してください" -#: ../../WPrefs.app/Menu.c:744 +#: ../../WPrefs.app/Menu.c:792 msgid "Directories with Files" msgstr "ファイルのあるディレクトリ" -#: ../../WPrefs.app/Menu.c:757 +#: ../../WPrefs.app/Menu.c:805 msgid "Strip extensions from file names" msgstr "拡張子を除去する" -#: ../../WPrefs.app/Menu.c:769 +#: ../../WPrefs.app/Menu.c:817 msgid "Keyboard Shortcut" msgstr "キーボードショートカット" -#: ../../WPrefs.app/Menu.c:805 +#: ../../WPrefs.app/Menu.c:853 msgid "Arrange Icons" msgstr "アイコンを整列" -#: ../../WPrefs.app/Menu.c:806 +#: ../../WPrefs.app/Menu.c:854 msgid "Hide All Windows Except For The Focused One" msgstr "フォーカスウィンドウ以外を隠す" -#: ../../WPrefs.app/Menu.c:807 +#: ../../WPrefs.app/Menu.c:855 msgid "Show All Windows" msgstr "全てのウィンドウを表示" -#: ../../WPrefs.app/Menu.c:810 +#: ../../WPrefs.app/Menu.c:858 msgid "Exit X Session" -msgstr "Xセッションを終了" +msgstr "X セッションを終了" -#: ../../WPrefs.app/Menu.c:811 +#: ../../WPrefs.app/Menu.c:859 msgid "Restart Window Maker" msgstr "Window Makerを再起動" -#: ../../WPrefs.app/Menu.c:812 +#: ../../WPrefs.app/Menu.c:860 msgid "Start Another Window Manager : (" msgstr "ちがうウィンドウマネージャを起動 (-_-#" -#: ../../WPrefs.app/Menu.c:814 +#: ../../WPrefs.app/Menu.c:862 msgid "Save Current Session" msgstr "セッションを保存" -#: ../../WPrefs.app/Menu.c:815 +#: ../../WPrefs.app/Menu.c:863 msgid "Clear Saved Session" msgstr "セッションをクリア" -#: ../../WPrefs.app/Menu.c:816 +#: ../../WPrefs.app/Menu.c:864 msgid "Refresh Screen" msgstr "画面の再描画" -#: ../../WPrefs.app/Menu.c:817 +#: ../../WPrefs.app/Menu.c:865 msgid "Open Info Panel" msgstr "情報パネル" -#: ../../WPrefs.app/Menu.c:818 +#: ../../WPrefs.app/Menu.c:866 msgid "Open Copyright Panel" msgstr "著作権表示" -#: ../../WPrefs.app/Menu.c:824 +#: ../../WPrefs.app/Menu.c:872 msgid "Window Manager to Start" msgstr "起動するウィンドウマネージャ" -#: ../../WPrefs.app/Menu.c:840 +#: ../../WPrefs.app/Menu.c:888 msgid "Do not confirm action." msgstr "動作をいちいち確認しない" -#: ../../WPrefs.app/Menu.c:850 +#: ../../WPrefs.app/Menu.c:896 msgid "" "Instructions:\n" "\n" @@ -1345,44 +1162,44 @@ " - 項目でダブルクリックしてラベルを編集\n" " - 項目をクリックして関連情報を編集" -#: ../../WPrefs.app/Menu.c:1067 +#: ../../WPrefs.app/Menu.c:1120 #, c-format msgid "unknown command '%s' in menu" msgstr "メニュー内のコマンド '%s' は知りません" -#: ../../WPrefs.app/Menu.c:1099 +#: ../../WPrefs.app/Menu.c:1152 msgid ": Execute Program" msgstr ": プログラムの実行" -#: ../../WPrefs.app/Menu.c:1103 +#: ../../WPrefs.app/Menu.c:1156 msgid ": Perform Internal Command" msgstr ": 内部コマンドの呼び出し" -#: ../../WPrefs.app/Menu.c:1107 +#: ../../WPrefs.app/Menu.c:1160 msgid ": Open a Submenu" msgstr ": サブメニューを開く" -#: ../../WPrefs.app/Menu.c:1111 +#: ../../WPrefs.app/Menu.c:1164 msgid ": Program Generated Submenu" msgstr ": サブメニューを自動生成" -#: ../../WPrefs.app/Menu.c:1115 +#: ../../WPrefs.app/Menu.c:1168 msgid ": Directory Contents Menu" msgstr ": メニューを含むディレクトリ" -#: ../../WPrefs.app/Menu.c:1119 +#: ../../WPrefs.app/Menu.c:1172 msgid ": Open Workspaces Submenu" msgstr ": ワークスペースサブメニューを開く" -#: ../../WPrefs.app/Menu.c:1123 +#: ../../WPrefs.app/Menu.c:1176 msgid ": Open Window List Submenu" msgstr ": ウィンドウ一覧サブメニューを開く" -#: ../../WPrefs.app/Menu.c:1343 +#: ../../WPrefs.app/Menu.c:1401 msgid "Remove Submenu" msgstr "サブメニューの削除" -#: ../../WPrefs.app/Menu.c:1344 +#: ../../WPrefs.app/Menu.c:1402 msgid "" "Removing this item will destroy all items inside\n" "the submenu. Do you really want to do that?" @@ -1390,30 +1207,49 @@ "この項目を削除すると中のサブメニューもみんな\n" "破壊します. 本当に実行しますか?" -#: ../../WPrefs.app/Menu.c:1346 +#: ../../WPrefs.app/Menu.c:1404 msgid "Yes" msgstr "はい" -#: ../../WPrefs.app/Menu.c:1346 +#: ../../WPrefs.app/Menu.c:1404 msgid "No" msgstr "いいえ" -#: ../../WPrefs.app/Menu.c:1347 +#: ../../WPrefs.app/Menu.c:1405 msgid "Yes, don't ask again." msgstr "はい, 以後確認しない" -#. if there is a localized plmenu for the tongue put it's filename here -#: ../../WPrefs.app/Menu.c:1514 ../../WPrefs.app/Menu.c:1521 -#, c-format -msgid "%s/Library/WindowMaker/plmenu" -msgstr "%s/Library/WindowMaker/plmenu.ja" - -#: ../../WPrefs.app/Menu.c:1530 +#: ../../WPrefs.app/Menu.c:1579 #, c-format msgid "Could not open default menu from '%s'" msgstr "標準のメニューを '%s' から開けませんでした" -#: ../../WPrefs.app/Menu.c:1569 +#: ../../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 "エラー" + +#: ../../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 "了解" + +#: ../../WPrefs.app/Menu.c:1612 ../../WPrefs.app/WPrefs.c:789 +msgid "Warning" +msgstr "警告" + +#: ../../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" @@ -1423,31 +1259,31 @@ "サポートしていません. このツールを使うために現行メニュー\n" "を廃棄してよろしいですか?" -#: ../../WPrefs.app/Menu.c:1572 +#: ../../WPrefs.app/Menu.c:1616 msgid "Yes, Discard and Update" msgstr "はい, 廃棄して更新" -#: ../../WPrefs.app/Menu.c:1573 +#: ../../WPrefs.app/Menu.c:1617 msgid "No, Keep Current Menu" msgstr "いいえ, 現状を維持" -#: ../../WPrefs.app/Menu.c:1821 +#: ../../WPrefs.app/Menu.c:1880 msgid "Applications Menu Definition" msgstr "アプリケーション・メニューの定義" -#: ../../WPrefs.app/Menu.c:1823 +#: ../../WPrefs.app/Menu.c:1882 msgid "Edit the menu for launching applications." msgstr "アプリを起動するメニューを編集" -#: ../../WPrefs.app/MenuPreferences.c:112 +#: ../../WPrefs.app/MenuPreferences.c:111 msgid "Menu Scrolling Speed" msgstr "メニューのスクロール速度" -#: ../../WPrefs.app/MenuPreferences.c:161 +#: ../../WPrefs.app/MenuPreferences.c:160 msgid "Submenu Alignment" msgstr "サブメニューの並び" -#: ../../WPrefs.app/MenuPreferences.c:205 +#: ../../WPrefs.app/MenuPreferences.c:204 msgid "" "Always open submenus inside the screen, instead of scrolling.\n" "Note: this is annoying." @@ -1455,15 +1291,15 @@ "スクロールしないでサブメニューを常に画面内に表示する.\n" "(ちょっとウザい)" -#: ../../WPrefs.app/MenuPreferences.c:210 +#: ../../WPrefs.app/MenuPreferences.c:209 msgid "Scroll off-screen menus when pointer is moved over them." msgstr "画面からはみ出たメニューをポインタの移動に合わせてスクロール" -#: ../../WPrefs.app/MenuPreferences.c:230 +#: ../../WPrefs.app/MenuPreferences.c:229 msgid "Menu Preferences" -msgstr "メニューの設定" +msgstr "メニューの設定 " -#: ../../WPrefs.app/MenuPreferences.c:232 +#: ../../WPrefs.app/MenuPreferences.c:231 msgid "" "Menu usability related options. Scrolling speed,\n" "alignment of submenus etc." @@ -1480,8 +1316,8 @@ "Invalid mouse acceleration threshold value. Must be the number of pixels to " "travel before accelerating." msgstr "" -"マウス加速のパラメーターが不正です. " -"加速を開始するまでの移動量をピクセルで指定します" +"マウス加速のパラメーターが不正です. 加速を開始するまでの移動量をピクセルで指" +"定します" #: ../../WPrefs.app/MouseSettings.c:262 ../../WPrefs.app/MouseSettings.c:274 #: ../../WPrefs.app/MouseSettings.c:286 ../../WPrefs.app/MouseSettings.c:298 @@ -1566,7 +1402,7 @@ #: ../../WPrefs.app/MouseSettings.c:724 #, c-format msgid "could not create temporary file %s" -msgstr "テンポラリファイル %s を作成できません" +msgstr "一時ファイル %s を作成できません" #: ../../WPrefs.app/MouseSettings.c:756 #, c-format @@ -1619,7 +1455,7 @@ #: ../../WPrefs.app/MouseSettings.c:849 msgid "Mouse Preferences" -msgstr "マウスの設定" +msgstr "マウスの設定 " #: ../../WPrefs.app/MouseSettings.c:851 msgid "" @@ -1629,36 +1465,40 @@ "マウスの速度や加速度, ダブルクリックの遅延,\n" "ボタン配置の編集などなど" -#: ../../WPrefs.app/Paths.c:84 +#: ../../WPrefs.app/Paths.c:85 msgid "bad value in option IconPath. Using default path list" msgstr "アイコンパスの値が不正です. デフォルトのパスを使用します" -#: ../../WPrefs.app/Paths.c:101 +#: ../../WPrefs.app/Paths.c:102 msgid "bad value in option PixmapPath. Using default path list" msgstr "Pixmapのパスが不正です. デフォルトのパスを使用します" -#: ../../WPrefs.app/Paths.c:149 +#: ../../WPrefs.app/Paths.c:150 msgid "Select directory" msgstr "ディレクトリの選択" -#: ../../WPrefs.app/Paths.c:270 +#: ../../WPrefs.app/Paths.c:266 msgid "Icon Search Paths" msgstr "アイコン検索パス" -#: ../../WPrefs.app/Paths.c:281 ../../WPrefs.app/Paths.c:312 -#: ../../WPrefs.app/TexturePanel.c:1311 +#: ../../WPrefs.app/Paths.c:277 ../../WPrefs.app/Paths.c:308 +#: ../../WPrefs.app/TexturePanel.c:1312 msgid "Add" msgstr "追加" -#: ../../WPrefs.app/Paths.c:301 +#: ../../WPrefs.app/Paths.c:284 ../../WPrefs.app/Paths.c:315 +msgid "Remove" +msgstr "除去" + +#: ../../WPrefs.app/Paths.c:297 msgid "Pixmap Search Paths" msgstr "Pixmap検索パス" -#: ../../WPrefs.app/Paths.c:341 +#: ../../WPrefs.app/Paths.c:337 msgid "Search Path Configuration" -msgstr "検索パスの設定" +msgstr "検索パスの設定 " -#: ../../WPrefs.app/Paths.c:343 +#: ../../WPrefs.app/Paths.c:339 msgid "" "Search paths to use when looking for pixmaps\n" "and icons." @@ -1667,10 +1507,12 @@ "探索パス" #: ../../WPrefs.app/Preferences.c:75 +#, c-format msgid "OFF" msgstr "OFF" #: ../../WPrefs.app/Preferences.c:77 +#, c-format msgid "1 pixel" msgstr "1 ピクセル" @@ -1780,7 +1622,7 @@ #: ../../WPrefs.app/Preferences.c:349 msgid "Miscellaneous Ergonomic Preferences" -msgstr "その他の操作性の設定" +msgstr "その他の操作性の設定 " #: ../../WPrefs.app/Preferences.c:350 msgid "" @@ -1802,73 +1644,73 @@ msgid "Hue" msgstr "色相" -#: ../../WPrefs.app/TexturePanel.c:610 +#: ../../WPrefs.app/TexturePanel.c:612 msgid "Could not load the selected file: " msgstr "選択したファイルが開けません: " -#: ../../WPrefs.app/TexturePanel.c:664 +#: ../../WPrefs.app/TexturePanel.c:666 msgid "Open Image" msgstr "画像を開く" -#: ../../WPrefs.app/TexturePanel.c:694 +#: ../../WPrefs.app/TexturePanel.c:696 msgid "The selected file does not contain a supported image." msgstr "選択したファイルには表示可能な画像が含まれていません." -#: ../../WPrefs.app/TexturePanel.c:945 +#: ../../WPrefs.app/TexturePanel.c:947 #, c-format msgid "could not load file '%s': %s" msgstr "ファイルを読み込めません '%s': %s" -#: ../../WPrefs.app/TexturePanel.c:1064 +#: ../../WPrefs.app/TexturePanel.c:1066 #, c-format msgid "error creating texture %s" msgstr "テクスチャの作成に失敗 %s" -#: ../../WPrefs.app/TexturePanel.c:1255 +#: ../../WPrefs.app/TexturePanel.c:1256 msgid "Texture Panel" msgstr "テクスチャパネル" -#: ../../WPrefs.app/TexturePanel.c:1263 +#: ../../WPrefs.app/TexturePanel.c:1264 msgid "Texture Name" msgstr "テクスチャの名前" -#: ../../WPrefs.app/TexturePanel.c:1275 +#: ../../WPrefs.app/TexturePanel.c:1276 msgid "Solid Color" msgstr "ベタ塗り" -#: ../../WPrefs.app/TexturePanel.c:1276 +#: ../../WPrefs.app/TexturePanel.c:1277 msgid "Gradient Texture" msgstr "グラデーション表示" -#: ../../WPrefs.app/TexturePanel.c:1277 +#: ../../WPrefs.app/TexturePanel.c:1278 msgid "Simple Gradient Texture" msgstr "単純なグラデージョン" -#: ../../WPrefs.app/TexturePanel.c:1278 +#: ../../WPrefs.app/TexturePanel.c:1279 msgid "Textured Gradient" msgstr "テクスチャでグラデーション" -#: ../../WPrefs.app/TexturePanel.c:1279 +#: ../../WPrefs.app/TexturePanel.c:1280 msgid "Image Texture" -msgstr "画像" +msgstr "テクスチャ画像" -#: ../../WPrefs.app/TexturePanel.c:1287 +#: ../../WPrefs.app/TexturePanel.c:1288 msgid "Default Color" msgstr "デフォルトの色" -#: ../../WPrefs.app/TexturePanel.c:1299 +#: ../../WPrefs.app/TexturePanel.c:1300 msgid "Gradient Colors" msgstr "グラデーションの色" -#: ../../WPrefs.app/TexturePanel.c:1395 +#: ../../WPrefs.app/TexturePanel.c:1396 msgid "Direction" msgstr "方向" -#: ../../WPrefs.app/TexturePanel.c:1423 +#: ../../WPrefs.app/TexturePanel.c:1424 msgid "Gradient" msgstr "変化度" -#: ../../WPrefs.app/TexturePanel.c:1441 +#: ../../WPrefs.app/TexturePanel.c:1442 msgid "Gradient Opacity" msgstr "不透明度" @@ -1915,12 +1757,131 @@ #: ../../WPrefs.app/Themes.c:193 msgid "Tile of The Day" -msgstr "今日のタイトル" +msgstr "今日のタイル" #: ../../WPrefs.app/Themes.c:213 msgid "Bar of The Day" msgstr "今日のバー" +#: ../../WPrefs.app/WPrefs.c:260 ../../WPrefs.app/WPrefs.c:331 +msgid "Window Maker Preferences" +msgstr "" + +#: ../../WPrefs.app/WPrefs.c:283 +msgid "Revert Page" +msgstr "ページを復帰" + +#: ../../WPrefs.app/WPrefs.c:289 +msgid "Revert All" +msgstr "全てを復帰" + +#: ../../WPrefs.app/WPrefs.c:295 +msgid "Save" +msgstr "保存" + +#: ../../WPrefs.app/WPrefs.c:308 +msgid "Balloon Help" +msgstr "バルーンヘルプ" + +#: ../../WPrefs.app/WPrefs.c:338 +#, c-format +msgid "Version %s" +msgstr "" + +#: ../../WPrefs.app/WPrefs.c:345 +msgid "Starting..." +msgstr "起動中..." + +#: ../../WPrefs.app/WPrefs.c:443 +#, c-format +msgid "could not locate image file %s\n" +msgstr "イメージファイル %s が見付かりません\n" + +#: ../../WPrefs.app/WPrefs.c:656 +#, c-format +msgid "could not load image file %s:%s" +msgstr "画像ファイル %s:%s を開けません" + +#: ../../WPrefs.app/WPrefs.c:674 +msgid "Loading Window Maker configuration files..." +msgstr "Window Maker の設定ファイルを読み込み中..." + +#: ../../WPrefs.app/WPrefs.c:678 +msgid "Initializing configuration panels..." +msgstr "設定パネルを初期化中..." + +#: ../../WPrefs.app/WPrefs.c:739 ../../WPrefs.app/WPrefs.c:819 +#, c-format +msgid "Window Maker domain (%s) is corrupted!" +msgstr "Window Maker のドメイン (%s) に障害!" + +#: ../../WPrefs.app/WPrefs.c:743 +#, c-format +msgid "Could not load Window Maker domain (%s) from defaults database." +msgstr "Window Maker domain (%s) をデフォルトデータベースから読み込めません" + +#: ../../WPrefs.app/WPrefs.c:759 +msgid "could not extract version information from Window Maker" +msgstr "Window Maker からバージョン情報を取得できません" + +#: ../../WPrefs.app/WPrefs.c:760 +msgid "Make sure wmaker is in your search path." +msgstr "wmaker がサーチパスに含まれているか確認して下さい" + +#: ../../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 のバージョン情報を読み取れません. 適切にインストールして, PATH " +"設定をしてあることを確認してください" + +#: ../../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のバージョン情報を読みとれません. 適切にインストールして, そこに " +"PATH を通していることを確認してください" + +#: ../../WPrefs.app/WPrefs.c:780 +#, c-format +msgid "" +"WPrefs only supports Window Maker 0.18.0 or newer.\n" +"The version installed is %i.%i.%i\n" +msgstr "" +"WPrefsはWindow Maker 0.18.0 以降をサポートしています.\n" +"インストールされているのは %i.%i.%i です\n" + +#: ../../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 "" +"あなたのシステムにインストールされているWindow Maker %i.%i.%i は, " +"Wprefsのこのバージョンでは一部サポートしておりません." + +#: ../../WPrefs.app/WPrefs.c:800 +#, c-format +msgid "could not run \"%s --global_defaults_path\"." +msgstr "\"%s -global_defaults_path\" を実行できません." + +#: ../../WPrefs.app/WPrefs.c:823 +#, c-format +msgid "Could not load global Window Maker domain (%s)." +msgstr "Window Makerのグローバル・ドメイン(%s)を読み込めません." + +#: ../../WPrefs.app/WPrefs.c:1072 +#, c-format +msgid "" +"bad speed value for option %s\n" +". Using default Medium" +msgstr "" +"オプション %s のspeed値は不正です. \n" +"デフォルト値を使用します" + #: ../../WPrefs.app/WindowHandling.c:141 #, c-format msgid "bad option value %s in WindowPlacement. Using default value" @@ -1956,7 +1917,7 @@ #: ../../WPrefs.app/WindowHandling.c:253 msgid "Cascade" -msgstr "カスケード" +msgstr "ずらして重ねる" #: ../../WPrefs.app/WindowHandling.c:254 msgid "Smart" @@ -2015,19 +1976,19 @@ msgid "Attract" msgstr "ひっつく" -#: ../../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 "" "ダイアログはオーナーと同じ\n" "ワークスペースに表示する" -#: ../../WPrefs.app/WindowHandling.c:450 +#: ../../WPrefs.app/WindowHandling.c:448 msgid "Window Handling Preferences" -msgstr "ウィンドウ操作の設定" +msgstr "ウィンドウ操作の設定 " -#: ../../WPrefs.app/WindowHandling.c:452 +#: ../../WPrefs.app/WindowHandling.c:450 msgid "" "Window handling options. Initial placement style\n" "edge resistance, opaque move etc." @@ -2040,19 +2001,15 @@ msgstr "ワークスペースの操作" #: ../../WPrefs.app/Workspace.c:183 -msgid "" -"wrap to the first workspace after the\n" -"last workspace." -msgstr "" -"最後のワークスペースから\n" -"最初のワークスペースに" +msgid "Wrap to the first workspace from the last workspace." +msgstr "最後のワークスペースから 最初のワークスペースに" #: ../../WPrefs.app/Workspace.c:205 -msgid "switch workspaces while dragging windows." +msgid "Switch workspaces while dragging windows." msgstr "ドラッグ中にワークスペースの切り替え" #: ../../WPrefs.app/Workspace.c:227 -msgid "automatically create new workspaces." +msgid "Automatically create new workspaces." msgstr "自動的に新しいワークスペースを作成" #: ../../WPrefs.app/Workspace.c:250 @@ -2113,7 +2070,7 @@ #: ../../WPrefs.app/Workspace.c:364 msgid "Workspace Preferences" -msgstr "ワークスペースの設定" +msgstr "ワークスペースの設定 " #: ../../WPrefs.app/Workspace.c:366 msgid "" @@ -2123,20 +2080,52 @@ "ワークスペースの操作の設定.\n" "ドック/クリップもここで有効化/無効化できます" -#~ msgid "" -#~ "Set keyboard input focus to\n" -#~ "the window under the mouse pointer,\n" -#~ "including the root window." -#~ msgstr "" -#~ "ルートウィンドウも含め, マウス\n" -#~ "ポインタの下のウィンドウにイン\n" -#~ "プット・フォーカスを移動する" +#: ../../WPrefs.app/imagebrowser.c:95 +msgid "View" +msgstr "ビュー" -#~ msgid "Click window to focus" -#~ msgstr "ウィンドウのクリックで" +#: ../../WPrefs.app/main.c:59 +#, c-format +msgid "usage: %s [options]\n" +msgstr "使用方法: %s [オプション]\n" -#~ msgid "Focus follows mouse" -#~ msgstr "マウスカーソルの移動で" +#: ../../WPrefs.app/main.c:60 +msgid "options:" +msgstr "オプション:" + +#: ../../WPrefs.app/main.c:61 +msgid " -display \tdisplay to be used" +msgstr " -display \tディスプレイの指定" + +#: ../../WPrefs.app/main.c:62 +msgid " --version\t\tprint version number and exit" +msgstr " --version\t\tバージョンを表示してすぐ終了する" + +#: ../../WPrefs.app/main.c:63 +msgid " --help\t\tprint this message and exit" +msgstr " --help\t\tこのメッセージを表示してすぐ終了する" + +#: ../../WPrefs.app/main.c:122 +#, c-format +msgid "too few arguments for %s" +msgstr "%sに対する引数が足りません" + +#: ../../WPrefs.app/main.c:145 +msgid "X server does not support locale" +msgstr "Xサーバがロケール機能をサポートしていません" + +#: ../../WPrefs.app/main.c:148 +msgid "cannot set locale modifiers" +msgstr "ロケールを設定できません" + +#: ../../WPrefs.app/main.c:154 +#, c-format +msgid "could not open display %s" +msgstr "ディスプレイ`%s'を開けません" + +#: ../../WPrefs.app/main.c:162 +msgid "could not initialize application" +msgstr "アプリケーションの初期化に失敗" -#~ msgid "\"Sloppy\" focus" -#~ msgstr "\"Sloppy\" フォーカス" +#~ msgid "%s/Library/WindowMaker/plmenu" +#~ msgstr "%s/Library/WindowMaker/plmenu.ja" diff -Naur WindowMaker-0.91.0/WPrefs.app/po/Makefile.am wm/WPrefs.app/po/Makefile.am --- WindowMaker-0.91.0/WPrefs.app/po/Makefile.am 2004-10-26 07:17:12 +0400 +++ wm/WPrefs.app/po/Makefile.am 2004-10-27 00:03:06 +0400 @@ -39,7 +39,7 @@ WPrefs.pot: $(POTFILES) xgettext --default-domain=WPrefs \ - --add-comments --keyword=_ $(POTFILES) + --add-comments --keyword=_ --keyword=N_ $(POTFILES) if cmp -s WPrefs.po WPrefs.pot; then \ rm -f WPrefs.po; \ else \ diff -Naur WindowMaker-0.91.0/WPrefs.app/po/Makefile.in wm/WPrefs.app/po/Makefile.in --- WindowMaker-0.91.0/WPrefs.app/po/Makefile.in 2004-10-26 08:10:47 +0400 +++ wm/WPrefs.app/po/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,263 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -CATALOGS = @WPMOFILES@ - -nlsdir = $(NLSDIR) - -CLEANFILES = WPrefs.pot $(CATALOGS) - -EXTRA_DIST = bg.po ca.po cs.po de.po es.po et.po fi.po fr.po hr.po hu.po it.po ja.po ko.po pt.po ru.po sk.po zh_CN.po zh_TW.po - - -POTFILES = $(top_builddir)/WPrefs.app/Appearance.c $(top_builddir)/WPrefs.app/Configurations.c $(top_builddir)/WPrefs.app/Expert.c $(top_builddir)/WPrefs.app/Focus.c $(top_builddir)/WPrefs.app/FontSimple.c $(top_builddir)/WPrefs.app/Icons.c $(top_builddir)/WPrefs.app/KeyboardSettings.c $(top_builddir)/WPrefs.app/KeyboardShortcuts.c $(top_builddir)/WPrefs.app/Menu.c $(top_builddir)/WPrefs.app/MenuPreferences.c $(top_builddir)/WPrefs.app/MouseSettings.c $(top_builddir)/WPrefs.app/Paths.c $(top_builddir)/WPrefs.app/Preferences.c $(top_builddir)/WPrefs.app/TexturePanel.c $(top_builddir)/WPrefs.app/Themes.c $(top_builddir)/WPrefs.app/WPrefs.c $(top_builddir)/WPrefs.app/WindowHandling.c $(top_builddir)/WPrefs.app/Workspace.c $(top_builddir)/WPrefs.app/imagebrowser.c $(top_builddir)/WPrefs.app/main.c - - -SUFFIXES = .po .mo -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -DIST_COMMON = README Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -.SUFFIXES: .mo .po -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/po/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WPrefs.app/po - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-data-local -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: -uninstall: uninstall-am -all-am: Makefile all-local -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - - -mostlyclean-generic: - -clean-generic: - -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: tags distdir info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-local install-data-am install-data install-am install \ -uninstall-am uninstall all-local all-redirect all-am all installdirs \ -mostlyclean-generic distclean-generic clean-generic \ -maintainer-clean-generic clean mostlyclean distclean maintainer-clean - - -.po.mo: - msgfmt -c -o $@ $< - -all-local: $(CATALOGS) - -WPrefs.pot: $(POTFILES) - xgettext --default-domain=WPrefs \ - --add-comments --keyword=_ $(POTFILES) - if cmp -s WPrefs.po WPrefs.pot; then \ - rm -f WPrefs.po; \ - else \ - mv -f WPrefs.po WPrefs.pot; \ - fi - -install-data-local: $(CATALOGS) - $(mkinstalldirs) $(DESTDIR)$(nlsdir) - chmod 755 $(DESTDIR)$(nlsdir) - for n in $(CATALOGS) __DuMmY ; do \ - if test "$$n" -a "$$n" != "__DuMmY" ; then \ - l=`basename $$n .mo`; \ - $(mkinstalldirs) $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \ - chmod 755 $(DESTDIR)$(nlsdir)/$$l; \ - chmod 755 $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES; \ - $(INSTALL_DATA) -m 644 $$n $(DESTDIR)$(nlsdir)/$$l/LC_MESSAGES/WPrefs.mo; \ - fi; \ - done - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WPrefs.app/po/zh_TW.po wm/WPrefs.app/po/zh_TW.po --- WindowMaker-0.91.0/WPrefs.app/po/zh_TW.po 2004-10-17 08:32:25 +0400 +++ wm/WPrefs.app/po/zh_TW.po 2005-01-21 07:05:48 +0300 @@ -1,790 +1,1252 @@ -# SOME DESCRIPTIVE TITLE. +# WPrefs PO file for Traditional Chinese. # Copyright (C) 1999 Free Software Foundation, Inc. -# Li Wei Jih , 1999. +# Li Wei Jih , 1999, 2005. # msgid "" msgstr "" -"Project-Id-Version: Window Maker-0.51.0\n" -"POT-Creation-Date: 1999-02-09 13:00+0800\n" -"PO-Revision-Date: 1999-02-09 13:00+0800\n" +"Project-Id-Version: Window Maker-0.91.0\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2005-01-10 10:51+0800\n" +"PO-Revision-Date: 2005-01-11 17:46+0800\n" "Last-Translator: Li Wei Jih \n" "Language-Team: chinese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8-bit\n" +"Content-Transfer-Encoding: 8-bit\n" -#: ../../WPrefs.app/Configurations.c:142 ../../WPrefs.app/Configurations.c:148 -#: ../../WPrefs.app/MouseSettings.c:526 ../../WPrefs.app/WindowHandling.c:274 -#: ../../WPrefs.app/WindowHandling.c:286 ../../WPrefs.app/Workspace.c:71 -#: ../../WPrefs.app/Workspace.c:77 +#: ../../WPrefs.app/Appearance.c:1154 +msgid "Select File" +msgstr "選取檔案" + +#: ../../WPrefs.app/Appearance.c:1555 +msgid "Focused Window" +msgstr "焦點視窗" + +#: ../../WPrefs.app/Appearance.c:1560 +msgid "Unfocused Window" +msgstr "非焦點視窗" + +#: ../../WPrefs.app/Appearance.c:1565 +msgid "Owner of Focused Window" +msgstr "焦點視窗擁有者" + +#: ../../WPrefs.app/Appearance.c:1570 ../../WPrefs.app/Appearance.c:1893 +msgid "Menu Title" +msgstr "選單標題" + +#: ../../WPrefs.app/Appearance.c:1575 ../../WPrefs.app/Appearance.c:1578 +msgid "Normal Item" +msgstr "正常項目" + +#: ../../WPrefs.app/Appearance.c:1583 +msgid "Disabled Item" +msgstr "失效項目" + +#: ../../WPrefs.app/Appearance.c:1595 +msgid "Highlighted" +msgstr "加強標示" + +#: ../../WPrefs.app/Appearance.c:1786 +msgid "Texture" +msgstr "材質" + +#: ../../WPrefs.app/Appearance.c:1794 +msgid "Titlebar of Focused Window" +msgstr "焦點視窗標題列" + +#: ../../WPrefs.app/Appearance.c:1795 +msgid "Titlebar of Unfocused Windows" +msgstr "非焦點視窗標題列" + +#: ../../WPrefs.app/Appearance.c:1796 +msgid "Titlebar of Focused Window's Owner" +msgstr "焦點視窗擁有者標題列" + +#: ../../WPrefs.app/Appearance.c:1797 +msgid "Window Resizebar" +msgstr "視窗大小變更列" + +#: ../../WPrefs.app/Appearance.c:1798 +msgid "Titlebar of Menus" +msgstr "選單標題列" + +#: ../../WPrefs.app/Appearance.c:1799 +msgid "Menu Items" +msgstr "選單項目" + +#: ../../WPrefs.app/Appearance.c:1800 +msgid "Icon Background" +msgstr "圖示背景" + +#: ../../WPrefs.app/Appearance.c:1815 +msgid "" +"Double click in the texture you want to use\n" +"for the selected item." +msgstr "在你要用於選取項目的材質點兩下。" + +#: ../../WPrefs.app/Appearance.c:1829 +msgid "New" +msgstr "新增" + +#: ../../WPrefs.app/Appearance.c:1833 +msgid "Create a new texture." +msgstr "建立新材質。" + +#: ../../WPrefs.app/Appearance.c:1841 +msgid "Extract..." +msgstr "提取..." + +#: ../../WPrefs.app/Appearance.c:1845 +msgid "Extract texture(s) from a theme or a style file." +msgstr "從主題或風格檔案提取材質。" + +#: ../../WPrefs.app/Appearance.c:1855 +msgid "Edit" +msgstr "編輯" + +#: ../../WPrefs.app/Appearance.c:1858 +msgid "Edit the highlighted texture." +msgstr "編輯加強標示的材質。" + +#: ../../WPrefs.app/Appearance.c:1866 ../../WPrefs.app/TexturePanel.c:1318 +msgid "Delete" +msgstr "刪除" + +#: ../../WPrefs.app/Appearance.c:1870 +msgid "Delete the highlighted texture." +msgstr "編輯加強標示的材質。" + +#: ../../WPrefs.app/Appearance.c:1883 +msgid "Color" +msgstr "色彩" + +#: ../../WPrefs.app/Appearance.c:1890 +msgid "Focused Window Title" +msgstr "焦點視窗標題列" + +#: ../../WPrefs.app/Appearance.c:1891 +msgid "Unfocused Window Title" +msgstr "非焦點視窗標題列" + +#: ../../WPrefs.app/Appearance.c:1892 +msgid "Owner of Focused Window Title" +msgstr "焦點視窗標題擁有者" + +#: ../../WPrefs.app/Appearance.c:1894 +msgid "Menu Item Text" +msgstr "選單項目文字" + +#: ../../WPrefs.app/Appearance.c:1895 +msgid "Disabled Menu Item Text" +msgstr "失效的選單項目文字" + +#: ../../WPrefs.app/Appearance.c:1896 +msgid "Menu Highlight Color" +msgstr "選單加強標示色彩" + +#: ../../WPrefs.app/Appearance.c:1897 +msgid "Highlighted Menu Text Color" +msgstr "加強標示的選單文字色彩" + +#: ../../WPrefs.app/Appearance.c:1936 +msgid "Background" +msgstr "背景" + +#: ../../WPrefs.app/Appearance.c:1948 ../../WPrefs.app/TexturePanel.c:1504 +msgid "Browse..." +msgstr "瀏覽..." + +#: ../../WPrefs.app/Appearance.c:1961 +msgid "Options" +msgstr "選項" + +#: ../../WPrefs.app/Appearance.c:1968 +msgid "Menu Style" +msgstr "選單風格" + +#: ../../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:546 +#: ../../WPrefs.app/WPrefs.c:571 +#, c-format +msgid "could not load icon file %s" +msgstr "無法載入圖示檔 %s" + +#: ../../WPrefs.app/Appearance.c:2010 +msgid "Title Alignment" +msgstr "標題對齊" + +#: ../../WPrefs.app/Appearance.c:2017 +msgid "Left" +msgstr "靠左" + +#: ../../WPrefs.app/Appearance.c:2020 ../../WPrefs.app/TexturePanel.c:1518 +#: ../../WPrefs.app/Workspace.c:270 +msgid "Center" +msgstr "置中" + +#: ../../WPrefs.app/Appearance.c:2023 +msgid "Right" +msgstr "靠右" + +#: ../../WPrefs.app/Appearance.c:2247 +msgid "Appearance Preferences" +msgstr "外觀設定" + +#: ../../WPrefs.app/Appearance.c:2249 +msgid "" +"Background texture configuration for windows,\n" +"menus and icons." +msgstr "" +"視窗、選單與圖示的背景材質設定。" + +#: ../../WPrefs.app/Appearance.c:2294 +msgid "Extract Texture" +msgstr "提取材質" + +#: ../../WPrefs.app/Appearance.c:2314 +msgid "Textures" +msgstr "材質" + +#: ../../WPrefs.app/Appearance.c:2325 ../../WPrefs.app/WPrefs.c:301 +msgid "Close" +msgstr "關閉" + +#: ../../WPrefs.app/Appearance.c:2330 +msgid "Extract" +msgstr "提取" + +#: ../../WPrefs.app/Configurations.c:150 ../../WPrefs.app/Configurations.c:156 +#: ../../WPrefs.app/MouseSettings.c:490 ../../WPrefs.app/WindowHandling.c:339 +#: ../../WPrefs.app/WindowHandling.c:351 ../../WPrefs.app/Workspace.c:90 +#: ../../WPrefs.app/Workspace.c:101 #, c-format msgid "could not load icon %s" msgstr "無法載入圖示 %s" -#: ../../WPrefs.app/Configurations.c:156 ../../WPrefs.app/Workspace.c:85 +#: ../../WPrefs.app/Configurations.c:164 ../../WPrefs.app/Workspace.c:109 #, c-format msgid "could not process icon %s:" msgstr "無法處理圖示 %s:" -#: ../../WPrefs.app/Configurations.c:181 ../../WPrefs.app/Workspace.c:124 +#: ../../WPrefs.app/Configurations.c:188 ../../WPrefs.app/Workspace.c:164 #, c-format msgid "could not load image file %s" msgstr "無法載入影像檔 %s" -#: ../../WPrefs.app/Configurations.c:195 +#: ../../WPrefs.app/Configurations.c:202 msgid "Icon Slide Speed" msgstr "圖示移動速度" -#: ../../WPrefs.app/Configurations.c:201 +#: ../../WPrefs.app/Configurations.c:208 msgid "Shade Animation Speed" msgstr "遮蔽動畫速度" -#: ../../WPrefs.app/Configurations.c:234 ../../WPrefs.app/Configurations.c:246 -#: ../../WPrefs.app/Focus.c:310 ../../WPrefs.app/Focus.c:321 -#: ../../WPrefs.app/MenuPreferences.c:135 -#: ../../WPrefs.app/MenuPreferences.c:146 -#: ../../WPrefs.app/MenuPreferences.c:174 -#: ../../WPrefs.app/MenuPreferences.c:189 ../../WPrefs.app/MouseSettings.c:554 -#: ../../WPrefs.app/MouseSettings.c:565 ../../WPrefs.app/MouseSettings.c:627 -#: ../../WPrefs.app/MouseSettings.c:638 ../../WPrefs.app/MouseSettings.c:674 -#: ../../WPrefs.app/MouseSettings.c:689 ../../WPrefs.app/MouseSettings.c:705 -#: ../../WPrefs.app/WPrefs.c:403 ../../WPrefs.app/WPrefs.c:421 -#, c-format -msgid "could not load icon file %s" -msgstr "無法載入圖示檔 %s" +#: ../../WPrefs.app/Configurations.c:270 +msgid "Smooth Scaling" +msgstr "平滑縮放" + +#: ../../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 "" +"平滑縮放背景圖，抵消「格柵化」效果。\n" +"這會使背景圖載入變得相當慢。" -#: ../../WPrefs.app/Configurations.c:262 +#: ../../WPrefs.app/Configurations.c:312 msgid "Titlebar Style" msgstr "標題列風格" -#: ../../WPrefs.app/Configurations.c:299 +#: ../../WPrefs.app/Configurations.c:350 msgid "Animations and Sound" msgstr "動畫與音效" -#: ../../WPrefs.app/Configurations.c:305 +#: ../../WPrefs.app/Configurations.c:356 msgid "Animations" msgstr "動畫" -#: ../../WPrefs.app/Configurations.c:321 +#: ../../WPrefs.app/Configurations.c:367 +msgid "" +"Disable/enable animations such as those shown\n" +"for window miniaturization, shading etc." +msgstr "" +"停用/啟用動畫，例如視窗最小化、遮蔽等的顯示。" + +#: ../../WPrefs.app/Configurations.c:375 msgid "Superfluous" msgstr "多餘的" -#: ../../WPrefs.app/Configurations.c:337 +#: ../../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 "" +"停用/啟用「多餘的」特色與動畫。\n" +"這包括停靠區被移到另一邊時的「鬼影」\n" +"與脫離圖示時的爆炸動畫。" + +#: ../../WPrefs.app/Configurations.c:396 msgid "Sounds" msgstr "音效" -#: ../../WPrefs.app/Configurations.c:354 -msgid "Note: sound requires a module distributed separately" -msgstr "註：音效需要單獨發送的模組" +#: ../../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://largo.windowmaker.org/files.php#WSoundServer" +msgstr "" +"停用/啟用遮蔽與關閉視窗動作時播放的音效支援。\n" +"你需要分開發送的模組。你可以在這裡取得:\n" +"http://largo.windowmaker.org/files.php#WSoundServer" + +#: ../../WPrefs.app/Configurations.c:418 +msgid "" +"Note: sound requires a module distributed\n" +"separately" +msgstr "註：音效需要分開發送的模組" -#: ../../WPrefs.app/Configurations.c:364 +#: ../../WPrefs.app/Configurations.c:428 msgid "Dithering colormap for 8bpp" msgstr "為 8bpp 色盤減色" -#: ../../WPrefs.app/Configurations.c:369 +#: ../../WPrefs.app/Configurations.c:430 +msgid "" +"Number of colors to reserve for Window Maker\n" +"on displays that support only 8bpp (PseudoColor)." +msgstr "" +"在只支援 8bpp (虛擬色彩) 的螢幕上\n" +"保留給 Window Maker 的色彩數。" + +#: ../../WPrefs.app/Configurations.c:437 msgid "Disable dithering in any visual/depth" msgstr "使任何視覺/深度中的減色失效" -#: ../../WPrefs.app/Configurations.c:390 -msgid "More colors for applications" +#: ../../WPrefs.app/Configurations.c:458 +msgid "" +"More colors for\n" +"applications" msgstr "" "應用程式\n" "使用更多色彩" -#: ../../WPrefs.app/Configurations.c:397 -msgid "More colors for WindowMaker" +#: ../../WPrefs.app/Configurations.c:465 +msgid "" +"More colors for\n" +"Window Maker" msgstr "" -"WindowMaker\n" +"Window Maker\n" "使用更多色彩" -#: ../../WPrefs.app/Configurations.c:450 +#: ../../WPrefs.app/Configurations.c:520 msgid "Other Configurations" msgstr "其他設定" -#: ../../WPrefs.app/Expert.c:70 -msgid "Do not set non-WindowMaker specific parameters (do not use xset)" -msgstr "不要設非 WindowMaker 指定參數（不要使用 xset）" - -#: ../../WPrefs.app/Expert.c:71 -msgid "Automatically save session when exiting WindowMaker" -msgstr "離開 WindowMaker 時自動儲存階段狀態" - -#: ../../WPrefs.app/Expert.c:72 -msgid "Use SaveUnder in window frames, icons, menus and other objects" -msgstr "在視窗框架，圖示，選單與其他物件使用 SaveUnder" - -#: ../../WPrefs.app/Expert.c:73 -msgid "Disable cycling color highlighting of icons." -msgstr "使圖示的循環色彩強調失效" +#: ../../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 "" +"動畫速度、標題列風格、各種選項切換\n" +"與在 8bit 螢幕上保留給 Window Maker 的色彩數。" -#: ../../WPrefs.app/Expert.c:103 -msgid "Expert User Preferences" -msgstr "熟練使用者設定" +#: ../../WPrefs.app/Expert.c:75 +msgid "" +"Disable miniwindows (icons for minimized windows). For use with KDE/GNOME." +msgstr "" +"停用迷你視窗 (最小化視窗的圖示)。用於 KDE/GNOME。" -#: ../../WPrefs.app/Focus.c:79 -#, c-format -msgid "bad option value %s for option FocusMode. Using default Manual" -msgstr "FocusMode 選項值 %s 錯誤。使用預設值" +#: ../../WPrefs.app/Expert.c:76 +msgid "Do not set non-WindowMaker specific parameters (do not use xset)." +msgstr "不要設非 WindowMaker 指定參數（不要使用 xset）。" -#: ../../WPrefs.app/Focus.c:92 -#, c-format -msgid "bad option value %s for option ColormapMode. Using default Manual" -msgstr "ColormapMode 選項值 %s 錯誤。使用預設值" +#: ../../WPrefs.app/Expert.c:77 +msgid "Automatically save session when exiting Window Maker." +msgstr "離開 Window Maker 時自動儲存時段。" -#: ../../WPrefs.app/Focus.c:190 -msgid "" -"Click on the window to set\n" -"keyboard input focus." -msgstr "在視窗上按一下設定鍵盤輸入焦點。" +#: ../../WPrefs.app/Expert.c:78 +msgid "Use SaveUnder in window frames, icons, menus and other objects." +msgstr "在視窗框架、圖示、選單與其他物件使用 SaveUnder。" -#: ../../WPrefs.app/Focus.c:194 -msgid "" -"Set keyboard input focus to\n" -"the window under the mouse pointer,\n" -"including the root window." -msgstr "" -"設定鍵盤輸入焦點至\n" -"滑鼠指標下面的視窗，\n" -"包含根視窗。" +#: ../../WPrefs.app/Expert.c:79 +msgid "Disable confirmation panel for the Kill command." +msgstr "停用 Kill 命令的確認面板。" + +#: ../../WPrefs.app/Expert.c:80 +msgid "Disable selection animation for selected icons." +msgstr "停用已選取圖示的選取動畫。" + +#: ../../WPrefs.app/Expert.c:81 +msgid "Smooth font edges (needs restart)." +msgstr "平滑字型邊緣 (需要重新啟動)。" -#: ../../WPrefs.app/Focus.c:199 +#: ../../WPrefs.app/Expert.c:117 +msgid "Expert User Preferences" +msgstr "熟練使用者設定" + +#: ../../WPrefs.app/Expert.c:119 msgid "" -"Set keyboard input focus to\n" -"the window under the mouse pointer,\n" -"except the root window." +"Options for people who know what they're doing...\n" +"Also have some other misc. options." msgstr "" -"設定鍵盤輸入焦點至\n" -"滑鼠指標下面的視窗，\n" -"根視窗除外。" +"給知道他們正在做什麼的人的選項...\n" +"也有一些其他各式各樣的選項。" -#: ../../WPrefs.app/Focus.c:243 +#: ../../WPrefs.app/Focus.c:80 +#, c-format +msgid "bad option value %s for option FocusMode. Using default Manual" +msgstr "選項 FocusMode 的選項值 %s 錯誤。使用預設值「手動」" + +#: ../../WPrefs.app/Focus.c:94 +#, c-format +msgid "bad option value %s for option ColormapMode. Using default Auto" +msgstr "選項 ColormapMode 的選項值 %s 錯誤。使用預設值「自動」" + +#: ../../WPrefs.app/Focus.c:214 msgid "Input Focus Mode" msgstr "輸入焦點模式" -#: ../../WPrefs.app/Focus.c:248 -msgid "Click window to focus" -msgstr "按視窗取得焦點" - -#: ../../WPrefs.app/Focus.c:249 -msgid "Focus follows mouse" -msgstr "焦點跟著滑鼠" - -#: ../../WPrefs.app/Focus.c:250 -msgid "\"Sloppy\" focus" -msgstr "\"Sloppy\" 焦點" +#: ../../WPrefs.app/Focus.c:222 +msgid "Manual: Click on the window to set keyboard input focus." +msgstr "手動: 在視窗上按一下設定鍵盤輸入焦點。" + +#: ../../WPrefs.app/Focus.c:229 +msgid "Auto: Set keyboard input focus to the window under the mouse pointer." +msgstr "自動: 設定鍵盤輸入焦點至滑鼠指標下面的視窗。" -#: ../../WPrefs.app/Focus.c:265 +#: ../../WPrefs.app/Focus.c:243 msgid "Install colormap in the window..." msgstr "安裝色盤..." -#: ../../WPrefs.app/Focus.c:270 +#: ../../WPrefs.app/Focus.c:248 msgid "...that has the input focus." msgstr "...輸入焦點所在視窗。" -#: ../../WPrefs.app/Focus.c:275 -msgid "...that is under the mouse pointer." +#: ../../WPrefs.app/Focus.c:253 +msgid "...that's under the mouse pointer." msgstr "...滑鼠指標下面的視窗。" -#: ../../WPrefs.app/Focus.c:284 +#: ../../WPrefs.app/Focus.c:262 msgid "Automatic Window Raise Delay" msgstr "自動升起視窗延遲" -#: ../../WPrefs.app/Focus.c:341 +#: ../../WPrefs.app/Focus.c:319 ../../WPrefs.app/MouseSettings.c:601 msgid "msec" msgstr "毫秒" -#: ../../WPrefs.app/Focus.c:358 +#: ../../WPrefs.app/Focus.c:336 msgid "Do not let applications receive the click used to focus windows." -msgstr "" -"不要讓應用程式得到用來設定\n" -"視窗焦點的滑鼠按鍵動作。" +msgstr "不要讓應用程式得到用來設定視窗焦點的滑鼠按鍵動作。" -#: ../../WPrefs.app/Focus.c:364 +#: ../../WPrefs.app/Focus.c:342 msgid "Automatically focus new windows." msgstr "新視窗自動得到焦點。" -#: ../../WPrefs.app/Focus.c:385 +#: ../../WPrefs.app/Focus.c:363 msgid "Window Focus Preferences" msgstr "視窗焦點設定" -#: ../../WPrefs.app/Icons.c:178 +#: ../../WPrefs.app/Focus.c:365 +msgid "" +"Keyboard focus switching policy, colormap switching\n" +"policy for 8bpp displays and other related options." +msgstr "" +"鍵盤焦點切換政策、8bpp 螢幕的色盤切換政策與其他相關選項。" + +#: ../../WPrefs.app/FontSimple.c:689 +msgid "Sample Text" +msgstr "範例文字" + +#: ../../WPrefs.app/FontSimple.c:707 +msgid "Family" +msgstr "種類" + +#: ../../WPrefs.app/FontSimple.c:736 +msgid "Style" +msgstr "風格" + +#: ../../WPrefs.app/FontSimple.c:739 +msgid "Size" +msgstr "大小" + +#: ../../WPrefs.app/FontSimple.c:777 +msgid "Font Configuration" +msgstr "字型設定" + +#: ../../WPrefs.app/FontSimple.c:779 +msgid "Configure fonts for Window Maker titlebars, menus etc." +msgstr "設定 Window Maker 標題列、選單等的字型。" + +#: ../../WPrefs.app/Icons.c:180 msgid "Icon Positioning" msgstr "圖示位置" -#: ../../WPrefs.app/Icons.c:225 +#: ../../WPrefs.app/Icons.c:227 msgid "Iconification Animation" msgstr "縮成圖示動畫" -#: ../../WPrefs.app/Icons.c:236 +#: ../../WPrefs.app/Icons.c:238 msgid "Shrinking/Zooming" msgstr "縮小/放大" -#: ../../WPrefs.app/Icons.c:237 +#: ../../WPrefs.app/Icons.c:239 msgid "Spinning/Twisting" msgstr "迴轉/轉向" -#: ../../WPrefs.app/Icons.c:238 +#: ../../WPrefs.app/Icons.c:240 msgid "3D-flipping" msgstr "立體翻轉" -#: ../../WPrefs.app/Icons.c:239 +#: ../../WPrefs.app/Icons.c:241 ../../WPrefs.app/MouseSettings.c:838 +#: ../../WPrefs.app/MouseSettings.c:843 msgid "None" msgstr "無" -#: ../../WPrefs.app/Icons.c:247 -msgid "Icon Display" -msgstr "圖示顯示" - -#: ../../WPrefs.app/Icons.c:252 +#: ../../WPrefs.app/Icons.c:254 msgid "Auto-arrange icons" msgstr "自動排列圖示" -#: ../../WPrefs.app/Icons.c:257 +#: ../../WPrefs.app/Icons.c:256 +msgid "Keep icons and miniwindows arranged all the time." +msgstr "隨時保持圖示與最小視窗的排列" + +#: ../../WPrefs.app/Icons.c:262 msgid "Omnipresent miniwindows" msgstr "最小視窗無所不在" -#: ../../WPrefs.app/Icons.c:265 +#: ../../WPrefs.app/Icons.c:264 +msgid "Make miniwindows be present in all workspaces." +msgstr "使最小視窗出現在所有工作區。" + +#: ../../WPrefs.app/Icons.c:273 msgid "Icon Size" msgstr "圖示大小" -#: ../../WPrefs.app/Icons.c:335 +#: ../../WPrefs.app/Icons.c:275 +msgid "The size of the dock/application icon and miniwindows" +msgstr "停靠區/應用程式圖示和最小視窗的大小" + +#: ../../WPrefs.app/Icons.c:345 msgid "Icon Preferences" msgstr "圖示設定" -#: ../../WPrefs.app/KeyboardSettings.c:72 +#: ../../WPrefs.app/Icons.c:347 +msgid "" +"Icon/Miniwindow handling options. Icon positioning\n" +"area, sizes of icons, miniaturization animation style." +msgstr "" +"圖示/最小視窗處理選項。\n" +"圖示放置區域、圖示大小、最小化動畫風格。" + +#: ../../WPrefs.app/KeyboardSettings.c:73 msgid "Initial Key Repeat" msgstr "啟始按鍵重複" -#: ../../WPrefs.app/KeyboardSettings.c:113 +#: ../../WPrefs.app/KeyboardSettings.c:114 msgid "Key Repeat Rate" msgstr "按鍵重複速率" -#: ../../WPrefs.app/KeyboardSettings.c:153 +#: ../../WPrefs.app/KeyboardSettings.c:154 msgid "Type here to test" msgstr "在此打字測試" -#: ../../WPrefs.app/KeyboardSettings.c:172 +#: ../../WPrefs.app/KeyboardSettings.c:173 msgid "Keyboard Preferences" msgstr "鍵盤設定" -#: ../../WPrefs.app/KeyboardShortcuts.c:183 ../../WPrefs.app/Menu.c:934 -#: ../../WPrefs.app/MenuGuru.c:263 +#: ../../WPrefs.app/KeyboardSettings.c:175 +msgid "Not done" +msgstr "未完成" + +#: ../../WPrefs.app/KeyboardShortcuts.c:310 ../../WPrefs.app/Menu.c:360 +#: ../../WPrefs.app/TexturePanel.c:1535 ../../WPrefs.app/imagebrowser.c:100 msgid "Cancel" msgstr "取消" -#: ../../WPrefs.app/KeyboardShortcuts.c:184 +#: ../../WPrefs.app/KeyboardShortcuts.c:311 msgid "Press the desired shortcut key(s) or click Cancel to stop capturing." msgstr "按下想要的捷徑鍵或按下取消停止抓取。" -#: ../../WPrefs.app/KeyboardShortcuts.c:204 -#: ../../WPrefs.app/KeyboardShortcuts.c:444 ../../WPrefs.app/Menu.c:946 -#: ../../WPrefs.app/Menu.c:1168 +#: ../../WPrefs.app/KeyboardShortcuts.c:331 +#: ../../WPrefs.app/KeyboardShortcuts.c:584 ../../WPrefs.app/Menu.c:371 +#: ../../WPrefs.app/Menu.c:830 msgid "Capture" msgstr "抓取" -#: ../../WPrefs.app/KeyboardShortcuts.c:205 -#: ../../WPrefs.app/KeyboardShortcuts.c:451 -msgid "Click Capture to interactively define the shortcut key." +#: ../../WPrefs.app/KeyboardShortcuts.c:332 +#: ../../WPrefs.app/KeyboardShortcuts.c:592 +msgid "Click on Capture to interactively define the shortcut key." msgstr "按下抓取可互動式定義捷徑鍵。" -#: ../../WPrefs.app/KeyboardShortcuts.c:359 +#: ../../WPrefs.app/KeyboardShortcuts.c:486 msgid "Actions" msgstr "動作" -#: ../../WPrefs.app/KeyboardShortcuts.c:375 +#: ../../WPrefs.app/KeyboardShortcuts.c:500 msgid "Open applications menu" msgstr "開啟應用程式選單" -#: ../../WPrefs.app/KeyboardShortcuts.c:376 +#: ../../WPrefs.app/KeyboardShortcuts.c:501 msgid "Open window list menu" msgstr "開啟視窗清單選單" -#: ../../WPrefs.app/KeyboardShortcuts.c:377 +#: ../../WPrefs.app/KeyboardShortcuts.c:502 msgid "Open window commands menu" msgstr "開啟視窗命令選單" -#: ../../WPrefs.app/KeyboardShortcuts.c:378 +#: ../../WPrefs.app/KeyboardShortcuts.c:503 msgid "Hide active application" msgstr "隱藏活動中的應用程式" -#: ../../WPrefs.app/KeyboardShortcuts.c:379 +#: ../../WPrefs.app/KeyboardShortcuts.c:504 +msgid "Hide other applications" +msgstr "隱藏其他的應用程式" + +#: ../../WPrefs.app/KeyboardShortcuts.c:505 msgid "Miniaturize active window" msgstr "最小化活動中的視窗" -#: ../../WPrefs.app/KeyboardShortcuts.c:380 +#: ../../WPrefs.app/KeyboardShortcuts.c:506 msgid "Close active window" msgstr "關閉活動中的視窗" -#: ../../WPrefs.app/KeyboardShortcuts.c:381 +#: ../../WPrefs.app/KeyboardShortcuts.c:507 msgid "Maximize active window" msgstr "最大化活動中的視窗" -#: ../../WPrefs.app/KeyboardShortcuts.c:382 +#: ../../WPrefs.app/KeyboardShortcuts.c:508 msgid "Maximize active window vertically" msgstr "垂直最大化活動中的視窗" -#: ../../WPrefs.app/KeyboardShortcuts.c:383 +#: ../../WPrefs.app/KeyboardShortcuts.c:509 +msgid "Maximize active window horizontally" +msgstr "水平最大化活動中的視窗" + +#: ../../WPrefs.app/KeyboardShortcuts.c:510 msgid "Raise active window" msgstr "升起活動中的視窗" -#: ../../WPrefs.app/KeyboardShortcuts.c:384 +#: ../../WPrefs.app/KeyboardShortcuts.c:511 msgid "Lower active window" msgstr "降下活動中的視窗" -#: ../../WPrefs.app/KeyboardShortcuts.c:385 +#: ../../WPrefs.app/KeyboardShortcuts.c:512 msgid "Raise/Lower window under mouse pointer" msgstr "升起/降下滑鼠指標下面的視窗" -#: ../../WPrefs.app/KeyboardShortcuts.c:386 +#: ../../WPrefs.app/KeyboardShortcuts.c:513 msgid "Shade active window" msgstr "遮蔽活動中的視窗" -#: ../../WPrefs.app/KeyboardShortcuts.c:387 +#: ../../WPrefs.app/KeyboardShortcuts.c:514 msgid "Move/Resize active window" msgstr "活動中的視窗移動/大小變更" -#: ../../WPrefs.app/KeyboardShortcuts.c:388 +#: ../../WPrefs.app/KeyboardShortcuts.c:515 msgid "Select active window" msgstr "選取活動中的視窗" -#: ../../WPrefs.app/KeyboardShortcuts.c:389 +#: ../../WPrefs.app/KeyboardShortcuts.c:516 msgid "Focus next window" msgstr "焦點移至下一個視窗" -#: ../../WPrefs.app/KeyboardShortcuts.c:390 +#: ../../WPrefs.app/KeyboardShortcuts.c:517 msgid "Focus previous window" msgstr "焦點移至上一個視窗" -#: ../../WPrefs.app/KeyboardShortcuts.c:391 +#: ../../WPrefs.app/KeyboardShortcuts.c:518 msgid "Switch to next workspace" msgstr "切換至下一個工作區" -#: ../../WPrefs.app/KeyboardShortcuts.c:392 +#: ../../WPrefs.app/KeyboardShortcuts.c:519 msgid "Switch to previous workspace" msgstr "切換至上一個工作區" -#: ../../WPrefs.app/KeyboardShortcuts.c:393 +#: ../../WPrefs.app/KeyboardShortcuts.c:520 msgid "Switch to next ten workspaces" msgstr "切換至後十個工作區" -#: ../../WPrefs.app/KeyboardShortcuts.c:394 +#: ../../WPrefs.app/KeyboardShortcuts.c:521 msgid "Switch to previous ten workspaces" msgstr "切換至前十個工作區" -#: ../../WPrefs.app/KeyboardShortcuts.c:395 +#: ../../WPrefs.app/KeyboardShortcuts.c:522 msgid "Switch to workspace 1" msgstr "切換至工作區 1" -#: ../../WPrefs.app/KeyboardShortcuts.c:396 +#: ../../WPrefs.app/KeyboardShortcuts.c:523 msgid "Switch to workspace 2" msgstr "切換至工作區 2" -#: ../../WPrefs.app/KeyboardShortcuts.c:397 +#: ../../WPrefs.app/KeyboardShortcuts.c:524 msgid "Switch to workspace 3" msgstr "切換至工作區 3" -#: ../../WPrefs.app/KeyboardShortcuts.c:398 +#: ../../WPrefs.app/KeyboardShortcuts.c:525 msgid "Switch to workspace 4" msgstr "切換至工作區 4" -#: ../../WPrefs.app/KeyboardShortcuts.c:399 +#: ../../WPrefs.app/KeyboardShortcuts.c:526 msgid "Switch to workspace 5" msgstr "切換至工作區 5" -#: ../../WPrefs.app/KeyboardShortcuts.c:400 +#: ../../WPrefs.app/KeyboardShortcuts.c:527 msgid "Switch to workspace 6" msgstr "切換至工作區 6" -#: ../../WPrefs.app/KeyboardShortcuts.c:401 +#: ../../WPrefs.app/KeyboardShortcuts.c:528 msgid "Switch to workspace 7" msgstr "切換至工作區 7" -#: ../../WPrefs.app/KeyboardShortcuts.c:402 +#: ../../WPrefs.app/KeyboardShortcuts.c:529 msgid "Switch to workspace 8" msgstr "切換至工作區 8" -#: ../../WPrefs.app/KeyboardShortcuts.c:403 +#: ../../WPrefs.app/KeyboardShortcuts.c:530 msgid "Switch to workspace 9" msgstr "切換至工作區 9" -#: ../../WPrefs.app/KeyboardShortcuts.c:404 +#: ../../WPrefs.app/KeyboardShortcuts.c:531 msgid "Switch to workspace 10" msgstr "切換至工作區 10" -#: ../../WPrefs.app/KeyboardShortcuts.c:405 +#: ../../WPrefs.app/KeyboardShortcuts.c:532 msgid "Shortcut for window 1" msgstr "視窗 1 的捷徑" -#: ../../WPrefs.app/KeyboardShortcuts.c:406 +#: ../../WPrefs.app/KeyboardShortcuts.c:533 msgid "Shortcut for window 2" msgstr "視窗 2 的捷徑" -#: ../../WPrefs.app/KeyboardShortcuts.c:407 +#: ../../WPrefs.app/KeyboardShortcuts.c:534 msgid "Shortcut for window 3" msgstr "視窗 3 的捷徑" -#: ../../WPrefs.app/KeyboardShortcuts.c:408 +#: ../../WPrefs.app/KeyboardShortcuts.c:535 msgid "Shortcut for window 4" msgstr "視窗 4 的捷徑" -#: ../../WPrefs.app/KeyboardShortcuts.c:409 +#: ../../WPrefs.app/KeyboardShortcuts.c:536 +msgid "Shortcut for window 5" +msgstr "視窗 5 的捷徑" + +#: ../../WPrefs.app/KeyboardShortcuts.c:537 +msgid "Shortcut for window 6" +msgstr "視窗 6 的捷徑" + +#: ../../WPrefs.app/KeyboardShortcuts.c:538 +msgid "Shortcut for window 7" +msgstr "視窗 7 的捷徑" + +#: ../../WPrefs.app/KeyboardShortcuts.c:539 +msgid "Shortcut for window 8" +msgstr "視窗 8 的捷徑" + +#: ../../WPrefs.app/KeyboardShortcuts.c:540 +msgid "Shortcut for window 9" +msgstr "視窗 9 的捷徑" + +#: ../../WPrefs.app/KeyboardShortcuts.c:541 +msgid "Shortcut for window 10" +msgstr "視窗 10 的捷徑" + +#: ../../WPrefs.app/KeyboardShortcuts.c:542 +msgid "Switch to Next Screen/Monitor" +msgstr "切換至後十個螢幕" + +#: ../../WPrefs.app/KeyboardShortcuts.c:544 +msgid "Move VirtualDesktop to next left edge" +msgstr "移動虛擬桌面至下一個左邊" + +#: ../../WPrefs.app/KeyboardShortcuts.c:545 +msgid "Move VirtualDesktop to next right edge" +msgstr "移動虛擬桌面至下一個右邊" + +#: ../../WPrefs.app/KeyboardShortcuts.c:546 +msgid "Move VirtualDesktop to next top edge" +msgstr "移動虛擬桌面至下一個上邊" + +#: ../../WPrefs.app/KeyboardShortcuts.c:547 +msgid "Move VirtualDesktop to next bottom edge" +msgstr "移動虛擬桌面至下一個下邊" + +#: ../../WPrefs.app/KeyboardShortcuts.c:549 msgid "Raise Clip" msgstr "升起迴紋針" -#: ../../WPrefs.app/KeyboardShortcuts.c:410 +#: ../../WPrefs.app/KeyboardShortcuts.c:550 msgid "Lower Clip" msgstr "降下迴紋針" -#: ../../WPrefs.app/KeyboardShortcuts.c:411 +#: ../../WPrefs.app/KeyboardShortcuts.c:551 msgid "Raise/Lower Clip" msgstr "升起/降下迴紋針" -#: ../../WPrefs.app/KeyboardShortcuts.c:413 +#: ../../WPrefs.app/KeyboardShortcuts.c:553 msgid "Toggle keyboard language" msgstr "切換鍵盤語言" -#: ../../WPrefs.app/KeyboardShortcuts.c:427 ../../WPrefs.app/Menu.c:1157 +#: ../../WPrefs.app/KeyboardShortcuts.c:567 msgid "Shortcut" msgstr "捷徑" -#: ../../WPrefs.app/KeyboardShortcuts.c:438 +#: ../../WPrefs.app/KeyboardShortcuts.c:578 ../../WPrefs.app/Menu.c:836 msgid "Clear" msgstr "清除" -#: ../../WPrefs.app/KeyboardShortcuts.c:499 +#: ../../WPrefs.app/KeyboardShortcuts.c:640 msgid "Keyboard Shortcut Preferences" msgstr "鍵盤捷徑設定" -#: ../../WPrefs.app/Menu.c:373 -msgid "Window Manager" -msgstr "視窗管理員" +#: ../../WPrefs.app/KeyboardShortcuts.c:642 +msgid "" +"Change the keyboard shortcuts for actions such\n" +"as changing workspaces and opening menus." +msgstr "" +"改變變更工作區與開啟選單動作的鍵盤捷徑。" -#: ../../WPrefs.app/Menu.c:375 -msgid "Program to open files" -msgstr "開啟檔案之程式" +#: ../../WPrefs.app/Menu.c:278 +msgid "Select Program" +msgstr "選取程式" -#: ../../WPrefs.app/Menu.c:377 ../../WPrefs.app/Menu.c:1144 -msgid "Program to Run" -msgstr "執行之程式" +#: ../../WPrefs.app/Menu.c:510 +msgid "New Items" +msgstr "新增項目" -#: ../../WPrefs.app/Menu.c:427 ../../WPrefs.app/Menu.c:428 -#, c-format -msgid "New Command %i" -msgstr "新增命令 %i" +#: ../../WPrefs.app/Menu.c:511 +msgid "Sample Commands" +msgstr "範例命令" -#: ../../WPrefs.app/Menu.c:435 -msgid "New Submenu" -msgstr "新增副選單" +#: ../../WPrefs.app/Menu.c:512 +msgid "Sample Submenus" +msgstr "範例副選單" -#: ../../WPrefs.app/Menu.c:440 -msgid "External Menu" -msgstr "外部選單" +#: ../../WPrefs.app/Menu.c:526 +msgid "Run Program" +msgstr "執行程式" -#: ../../WPrefs.app/Menu.c:447 -msgid "Workspaces" -msgstr "工作區" +#: ../../WPrefs.app/Menu.c:527 +msgid "Internal Command" +msgstr "內部命令" + +#: ../../WPrefs.app/Menu.c:528 +msgid "Submenu" +msgstr "副選單" + +#: ../../WPrefs.app/Menu.c:529 +msgid "External Submenu" +msgstr "外部副選單" + +#: ../../WPrefs.app/Menu.c:530 +msgid "Generated Submenu" +msgstr "產生的副選單" + +#: ../../WPrefs.app/Menu.c:531 +msgid "Directory Contents" +msgstr "目錄內容" + +#: ../../WPrefs.app/Menu.c:532 +msgid "Workspace Menu" +msgstr "工作區選單" -#: ../../WPrefs.app/Menu.c:1028 ../../WPrefs.app/Menu.c:1043 -msgid "Commands" -msgstr "命令" +#: ../../WPrefs.app/Menu.c:533 ../../WPrefs.app/MouseSettings.c:840 +msgid "Window List Menu" +msgstr "視窗清單選單" -#: ../../WPrefs.app/Menu.c:1029 ../../WPrefs.app/Menu.c:1044 -msgid "Add Command" -msgstr "新增命令" - -#: ../../WPrefs.app/Menu.c:1030 ../../WPrefs.app/Menu.c:1045 -msgid "Add Submenu" -msgstr "增加副選單" - -#: ../../WPrefs.app/Menu.c:1031 ../../WPrefs.app/Menu.c:1046 -msgid "Add External Menu" -msgstr "增加外部選單" - -#: ../../WPrefs.app/Menu.c:1032 ../../WPrefs.app/Menu.c:1047 -msgid "Add Workspace Menu" -msgstr "增加工作區" - -#: ../../WPrefs.app/Menu.c:1033 ../../WPrefs.app/Menu.c:1048 -msgid "Remove Item" -msgstr "刪除項目" - -#: ../../WPrefs.app/Menu.c:1034 ../../WPrefs.app/Menu.c:1049 -msgid "Cut Item" -msgstr "剪下項目" - -#: ../../WPrefs.app/Menu.c:1035 ../../WPrefs.app/Menu.c:1050 -msgid "Copy Item" -msgstr "複製項目" - -#: ../../WPrefs.app/Menu.c:1036 ../../WPrefs.app/Menu.c:1051 -msgid "Paste Item" -msgstr "貼上項目" - -#: ../../WPrefs.app/Menu.c:1080 -msgid "Label" -msgstr "標籤" +#: ../../WPrefs.app/Menu.c:552 +msgid "XTerm" +msgstr "XTerm" -#: ../../WPrefs.app/Menu.c:1093 -msgid "Command" -msgstr "命令" +#: ../../WPrefs.app/Menu.c:555 +msgid "rxvt" +msgstr "rxvt" -#: ../../WPrefs.app/Menu.c:1098 -msgid "Run Program" -msgstr "執行程式" +#: ../../WPrefs.app/Menu.c:558 +msgid "ETerm" +msgstr "ETerm" -#: ../../WPrefs.app/Menu.c:1099 -msgid "Arrange Icons" -msgstr "排列圖示" +#: ../../WPrefs.app/Menu.c:561 +msgid "Run..." +msgstr "執行..." -#: ../../WPrefs.app/Menu.c:1100 -msgid "Hide Others" -msgstr "隱藏其他" +#: ../../WPrefs.app/Menu.c:562 +#, c-format +msgid "%a(Run,Type command to run)" +msgstr "%a(執行,輸入要執行的命令)" -#: ../../WPrefs.app/Menu.c:1101 -msgid "Show All Windows" -msgstr "顯示所有視窗" +#: ../../WPrefs.app/Menu.c:564 +msgid "Netscape" +msgstr "Netscape" -#: ../../WPrefs.app/Menu.c:1102 -msgid "Exit WindowMaker" -msgstr "離開 WindowMaker" +#: ../../WPrefs.app/Menu.c:567 +msgid "gimp" +msgstr "gimp" -#: ../../WPrefs.app/Menu.c:1103 -msgid "Exit X Session" -msgstr "離開 X 視窗系統" +#: ../../WPrefs.app/Menu.c:570 +msgid "epic" +msgstr "epic" -#: ../../WPrefs.app/Menu.c:1104 -msgid "Start window manager" -msgstr "啟動視窗管理員" - -#: ../../WPrefs.app/Menu.c:1105 -msgid "Restart WindowMaker" -msgstr "重新啟動 WindowMaker" - -#: ../../WPrefs.app/Menu.c:1106 -msgid "Save Session" -msgstr "儲存階段狀態" - -#: ../../WPrefs.app/Menu.c:1107 -msgid "Clear Session" -msgstr "清除階段狀態" +#: ../../WPrefs.app/Menu.c:573 +msgid "ee" +msgstr "ee" -#: ../../WPrefs.app/Menu.c:1108 -msgid "Refresh Screen" -msgstr "更新螢幕" +#: ../../WPrefs.app/Menu.c:576 +msgid "xv" +msgstr "xv" -#: ../../WPrefs.app/Menu.c:1109 -msgid "Info Panel" -msgstr "資訊面板" - -#: ../../WPrefs.app/Menu.c:1110 -msgid "Legal Panel" -msgstr "法律面板" - -#: ../../WPrefs.app/Menu.c:1118 -msgid "Open workspace menu" -msgstr "開啟工作區選單" - -#: ../../WPrefs.app/Menu.c:1125 -msgid "No confirmation panel" -msgstr "無確認面板" - -#: ../../WPrefs.app/Menu.c:1131 -msgid "Menu Path/Directory List" -msgstr "選單路徑/目錄清單" +#: ../../WPrefs.app/Menu.c:579 +msgid "Acrobat Reader" +msgstr "Acrobat Reader" -#: ../../WPrefs.app/Menu.c:1176 -msgid "Ask help to the Guru" -msgstr "向專家求助" +#: ../../WPrefs.app/Menu.c:582 +msgid "ghostview" +msgstr "ghostview" -#. if there is a localized plmenu for the tongue put it's filename here -#: ../../WPrefs.app/Menu.c:1287 ../../WPrefs.app/Menu.c:1294 -#, c-format -msgid "%s/Library/WindowMaker/plmenu" -msgstr "%s/Library/WindowMaker/plmenu" +#: ../../WPrefs.app/Menu.c:585 ../../WPrefs.app/Menu.c:857 +msgid "Exit Window Maker" +msgstr "離開 Window Maker" -#: ../../WPrefs.app/Menu.c:1302 ../../WPrefs.app/MouseSettings.c:146 -#: ../../WPrefs.app/MouseSettings.c:169 ../../WPrefs.app/Text.c:181 -#: ../../WPrefs.app/Themes.c:96 ../../WPrefs.app/WPrefs.c:558 -#: ../../WPrefs.app/WPrefs.c:563 ../../WPrefs.app/WPrefs.c:572 -#: ../../WPrefs.app/WPrefs.c:582 ../../WPrefs.app/WPrefs.c:590 -#: ../../WPrefs.app/WPrefs.c:614 ../../WPrefs.app/WPrefs.c:619 -msgid "Error" -msgstr "錯誤" +#: ../../WPrefs.app/Menu.c:608 +msgid "Debian Menu" +msgstr "Debian 選單" -#: ../../WPrefs.app/Menu.c:1302 -msgid "Could not copy default plmenu file from ~/GNUstep/Library/WindowMaker" -msgstr "在 ~/GNUstep/Library/WindowMaker 底下找不到預設的 plmenu 檔案" - -#: ../../WPrefs.app/Menu.c:1304 ../../WPrefs.app/Menu.c:1354 -#: ../../WPrefs.app/MenuGuru.c:119 ../../WPrefs.app/MenuGuru.c:126 -#: ../../WPrefs.app/MenuGuru.c:140 ../../WPrefs.app/MouseSettings.c:148 -#: ../../WPrefs.app/MouseSettings.c:171 ../../WPrefs.app/Text.c:181 -#: ../../WPrefs.app/Themes.c:98 ../../WPrefs.app/WPrefs.c:558 -#: ../../WPrefs.app/WPrefs.c:563 ../../WPrefs.app/WPrefs.c:574 -#: ../../WPrefs.app/WPrefs.c:584 ../../WPrefs.app/WPrefs.c:590 -#: ../../WPrefs.app/WPrefs.c:597 ../../WPrefs.app/WPrefs.c:614 -#: ../../WPrefs.app/WPrefs.c:619 -msgid "OK" -msgstr "確定" +#: ../../WPrefs.app/Menu.c:611 +msgid "RedHat Menu" +msgstr "RedHat 選單" + +#: ../../WPrefs.app/Menu.c:614 +msgid "Menu Conectiva" +msgstr "Conectiva 選單" + +#: ../../WPrefs.app/Menu.c:617 ../../WPrefs.app/Themes.c:250 +msgid "Themes" +msgstr "主題" -#: ../../WPrefs.app/Menu.c:1339 +#: ../../WPrefs.app/Menu.c:622 +msgid "Bg Images (scale)" +msgstr "背景圖 (縮放)" + +#: ../../WPrefs.app/Menu.c:627 +msgid "Bg Images (tile)" +msgstr "背景圖 (並排)" + +#: ../../WPrefs.app/Menu.c:632 +msgid "Assorted XTerms" +msgstr "各式各樣的 XTerm" + +#: ../../WPrefs.app/Menu.c:634 +msgid "XTerm Yellow on Blue" +msgstr "XTerm 藍底黃字" + +#: ../../WPrefs.app/Menu.c:637 +msgid "XTerm White on Black" +msgstr "XTerm 黑底白字" + +#: ../../WPrefs.app/Menu.c:640 +msgid "XTerm Black on White" +msgstr "XTerm 白底黑字" + +#: ../../WPrefs.app/Menu.c:643 +msgid "XTerm Black on Beige" +msgstr "XTerm 米底黑字" + +#: ../../WPrefs.app/Menu.c:646 +msgid "XTerm White on Green" +msgstr "XTerm 綠底白字" + +#: ../../WPrefs.app/Menu.c:649 +msgid "XTerm White on Olive" +msgstr "XTerm 褐底白字" + +#: ../../WPrefs.app/Menu.c:652 +msgid "XTerm Blue on Blue" +msgstr "XTerm 藍底藍字" + +#: ../../WPrefs.app/Menu.c:655 +msgid "XTerm BIG FONTS" +msgstr "XTerm 大字型" + +#: ../../WPrefs.app/Menu.c:677 +msgid "Program to Run" +msgstr "執行之程式" + +#: ../../WPrefs.app/Menu.c:687 +msgid "Browse" +msgstr "瀏覽" + +#: ../../WPrefs.app/Menu.c:698 +msgid "Run the program inside a Xterm" +msgstr "在 Xterm 內執行程式" + +#: ../../WPrefs.app/Menu.c:708 +msgid "Path for Menu" +msgstr "選單路徑" + +#: ../../WPrefs.app/Menu.c:721 +msgid "" +"Enter the path for a file containing a menu\n" +"or a list of directories with the programs you\n" +"want to have listed in the menu. Ex:\n" +"~/GNUstep/Library/WindowMaker/menu\n" +"or\n" +"/usr/X11R6/bin ~/xbin" +msgstr "" +"輸入含有選單的檔案或你要列在選單的程式目錄清單\n" +"的路徑。例如:\n" +"~/GNUstep/Library/WindowMaker/menu\n" +"或\n" +"/usr/X11R6/bin ~/xbin" + +#: ../../WPrefs.app/Menu.c:736 +msgid "Command" +msgstr "命令" + +#: ../../WPrefs.app/Menu.c:750 msgid "" -"The format of the menu in ~/G/D/WMRootMenu is not recognized by WPrefs. It " -"might be in a format different than the one supported by WPrefs or contain a " -"syntax error. Do you want to continue using the current menu to edit it by " -"hand later or replace it with a default menu in the new format?" -msgstr "WPrefs 無法辨認 ~/G/D/WMRootMenu 的選單格式，原有的選單可能是 WPrefs 不支援的格式，也可能是選單定義有語法錯誤；你希望繼續使用目前的選單並且在以後都以手動編輯，還是讓 WPrefs 為您換上一個新的預設選單? " +"Enter a command that outputs a menu\n" +"definition to stdout when invoked." +msgstr "" +"輸入用來輸出選單定義到標準輸出的命令。" -#: ../../WPrefs.app/Menu.c:1346 ../../WPrefs.app/Menu.c:1353 -#: ../../WPrefs.app/WPrefs.c:597 -msgid "Warning" -msgstr "注意" +#: ../../WPrefs.app/Menu.c:758 +msgid "" +"Cache menu contents after opening for\n" +"the first time" +msgstr "" +"第一次開啟後快取選單內容" -#: ../../WPrefs.app/Menu.c:1346 -msgid "Keep current menu" -msgstr "儲存目前選單" - -#: ../../WPrefs.app/Menu.c:1347 -msgid "Install default menu" -msgstr "安裝預設選單" - -#: ../../WPrefs.app/Menu.c:1353 -msgid "Any changes made in this section will not be saved" -msgstr "在這部份的任何改變不會被儲存" +#: ../../WPrefs.app/Menu.c:769 +msgid "Command to Open Files" +msgstr "開啟檔案之程式" -#: ../../WPrefs.app/Menu.c:1419 -msgid "Applications Menu Definition" -msgstr "應用程式選單定義" +#: ../../WPrefs.app/Menu.c:783 +msgid "" +"Enter the command you want to use to open the\n" +"files in the directories listed below." +msgstr "" +"輸入你要用來開啟下列目錄中檔案的命令。" -#: ../../WPrefs.app/MenuGuru.c:106 -msgid "Menu Guru - Select Type" -msgstr "選單專家 - 選取型態" +#: ../../WPrefs.app/Menu.c:792 +msgid "Directories with Files" +msgstr "含有檔案的目錄" -#: ../../WPrefs.app/MenuGuru.c:111 ../../WPrefs.app/MenuGuru.c:133 -#: ../../WPrefs.app/MenuGuru.c:251 -msgid "Next" -msgstr "下一步" +#: ../../WPrefs.app/Menu.c:805 +msgid "Strip extensions from file names" +msgstr "刪除檔名的副檔名" -#: ../../WPrefs.app/MenuGuru.c:114 -msgid "Menu Guru - Select Menu File" -msgstr "選單專家 - 選取選單檔" +#: ../../WPrefs.app/Menu.c:817 +msgid "Keyboard Shortcut" +msgstr "鍵盤捷徑" -#: ../../WPrefs.app/MenuGuru.c:122 -msgid "Menu Guru - Select Pipe Command" -msgstr "選單專家 - 選取 Pipe 命令" +#: ../../WPrefs.app/Menu.c:853 +msgid "Arrange Icons" +msgstr "排列圖示" -#: ../../WPrefs.app/MenuGuru.c:129 -msgid "Menu Guru - Select Directories" -msgstr "選單專家 - 選取目錄" +#: ../../WPrefs.app/Menu.c:854 +msgid "Hide All Windows Except For The Focused One" +msgstr "除了焦點視窗外隱藏所有視窗" -#: ../../WPrefs.app/MenuGuru.c:136 -msgid "Menu Guru - Select Command" -msgstr "選單專家 - 選取命令" +#: ../../WPrefs.app/Menu.c:855 +msgid "Show All Windows" +msgstr "顯示所有視窗" -#: ../../WPrefs.app/MenuGuru.c:257 -msgid "Back" -msgstr "上一步" +#: ../../WPrefs.app/Menu.c:858 +msgid "Exit X Session" +msgstr "離開 X 視窗系統" -#: ../../WPrefs.app/MenuGuru.c:271 -msgid "" -"This process will help you create a submenu which definition is located in " -"another file or is created dynamically.\n" -"What do you want to use as the contents of the submenu?" +#: ../../WPrefs.app/Menu.c:859 +msgid "Restart Window Maker" +msgstr "重新啟動 Window Maker" + +#: ../../WPrefs.app/Menu.c:860 +msgid "Start Another Window Manager : (" +msgstr "啟動其他的視窗管理員：（" + +#: ../../WPrefs.app/Menu.c:862 +msgid "Save Current Session" +msgstr "儲存目前時段" + +#: ../../WPrefs.app/Menu.c:863 +msgid "Clear Saved Session" +msgstr "清除已儲存時段" + +#: ../../WPrefs.app/Menu.c:864 +msgid "Refresh Screen" +msgstr "更新螢幕" + +#: ../../WPrefs.app/Menu.c:865 +msgid "Open Info Panel" +msgstr "開啟資訊面板" + +#: ../../WPrefs.app/Menu.c:866 +msgid "Open Copyright Panel" +msgstr "開啟版權面板" + +#: ../../WPrefs.app/Menu.c:872 +msgid "Window Manager to Start" +msgstr "要啟動的視窗管理員" + +#: ../../WPrefs.app/Menu.c:888 +msgid "Do not confirm action." +msgstr "不確認動作。" + +#: ../../WPrefs.app/Menu.c:896 +msgid "" +"Instructions:\n" +"\n" +" - drag items from the left to the menu to add new items\n" +" - drag items out of the menu to remove items\n" +" - drag items in menu to change their position\n" +" - drag items with Control pressed to copy them\n" +" - double click in a menu item to change the label\n" +" - click on a menu item to change related information" msgstr "" -"這程序會幫您建立在另一個檔案或動態建立定義的副目錄。\n" -"您要用什麼當作副目錄的內容？" +"說明:\n" +"\n" +" - 從左邊拖曳項目到選單可增加新項目\n" +" - 從選單拖出項目可刪除項目\n" +" - 在選單中拖曳項目可變更其位置\n" +" - 按 Control 鍵拖曳項目可複製它們\n" +" - 在選單項目點兩下可變更標籤\n" +" - 在選單項目點一下可變更相關資訊" + +#: ../../WPrefs.app/Menu.c:1120 +#, c-format +msgid "unknown command '%s' in menu" +msgstr "選單中有不明的命令 '%s'" + +#: ../../WPrefs.app/Menu.c:1152 +msgid ": Execute Program" +msgstr ": 執行程式" + +#: ../../WPrefs.app/Menu.c:1156 +msgid ": Perform Internal Command" +msgstr ": 執行內部命令" + +#: ../../WPrefs.app/Menu.c:1160 +msgid ": Open a Submenu" +msgstr ": 開啟副選單" + +#: ../../WPrefs.app/Menu.c:1164 +msgid ": Program Generated Submenu" +msgstr ": 程式產生之副選單" -#: ../../WPrefs.app/MenuGuru.c:279 -msgid "" -"A file containing the menu definition in the plain text (non-property list) " -"menu format." -msgstr "含有純文字（無特質清單）選單格式選單定義的檔案。" +#: ../../WPrefs.app/Menu.c:1168 +msgid ": Directory Contents Menu" +msgstr ": 目錄內容選單" -#: ../../WPrefs.app/MenuGuru.c:285 -msgid "The menu definition generated by a script/program read through a pipe." -msgstr "由手稿/程式經過 pipe 讀入產生選單定義" +#: ../../WPrefs.app/Menu.c:1172 +msgid ": Open Workspaces Submenu" +msgstr ": 開啟工作區副選單" -#: ../../WPrefs.app/MenuGuru.c:291 -msgid "The files in one or more directories." -msgstr "檔案在一個或多個目錄中" +#: ../../WPrefs.app/Menu.c:1176 +msgid ": Open Window List Submenu" +msgstr ": 開啟視窗清單選單" -#: ../../WPrefs.app/MenuGuru.c:303 -msgid "Type the path for the menu file:" -msgstr "輸入選單檔路徑：" +#: ../../WPrefs.app/Menu.c:1401 +msgid "Remove Submenu" +msgstr "刪除副選單" -#: ../../WPrefs.app/MenuGuru.c:318 +#: ../../WPrefs.app/Menu.c:1402 msgid "" -"The menu file must contain a menu in the plain text menu file format. This " -"format is described in the menu files included with WindowMaker, probably at " -"~/GNUstep/Library/WindowMaker/menu" +"Removing this item will destroy all items inside\n" +"the submenu. Do you really want to do that?" msgstr "" -"選單檔必須含有純文字選單檔格式的選單。這格式在 WindowMaker " -"包含的選單檔中有描述，可能在~/GNUstep/Library/WindowMaker/menu" +"刪除此項目會破壞副選單中所有項目。\n" +"你真的要這樣做？" -#: ../../WPrefs.app/MenuGuru.c:328 -msgid "Type the command that will generate the menu definition:" -msgstr "輸入會產生選單定義的命令：" +#: ../../WPrefs.app/Menu.c:1404 +msgid "Yes" +msgstr "是" + +#: ../../WPrefs.app/Menu.c:1404 +msgid "No" +msgstr "否" + +#: ../../WPrefs.app/Menu.c:1405 +msgid "Yes, don't ask again." +msgstr "是，不要再問。" + +#: ../../WPrefs.app/Menu.c:1579 +#, c-format +msgid "Could not open default menu from '%s'" +msgstr "無法從 '%s' 開啟預設選單" + +#: ../../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 "錯誤" -#: ../../WPrefs.app/MenuGuru.c:338 -msgid "" -"The command supplied must generate and output a valid menu definition to " -"stdout. This definition should be in the plain text menu file format, " -"described in the menu files included with WindowMaker, usually at " -"~/GNUstep/Library/WindowMaker/menu" -msgstr "" -"提供的命令必須產生且輸出有效的選單定義至標準輸出。這定義應該是純文字選單檔格" -"﹛A在 WindowMaker 包含的選單檔中有描述，通常在 " -"~/GNUstep/Library/WindowMaker/menu" +#: ../../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 "確定" -#: ../../WPrefs.app/MenuGuru.c:350 ../../WPrefs.app/MenuGuru.c:372 -#: ../../WPrefs.app/MenuGuru.c:394 -msgid "" -"Type the path for the directory. You can type more than one path by " -"separating them with spaces." -msgstr "輸入目錄的路徑。您可以利用空白分隔輸入超過一個路徑。" +#: ../../WPrefs.app/Menu.c:1612 ../../WPrefs.app/WPrefs.c:789 +msgid "Warning" +msgstr "注意" -#: ../../WPrefs.app/MenuGuru.c:361 ../../WPrefs.app/MenuGuru.c:383 -#: ../../WPrefs.app/MenuGuru.c:405 +#: ../../WPrefs.app/Menu.c:1613 msgid "" -"The menu generated will have an item for each file in the directory. The " -"directories can contain program executables or data files (such as jpeg " -"images)." +"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 "" -"產生的選單會有一個項目給目錄中的每一個檔案。目錄可以含有可執行的程式或資料檔" -"]例如 jpeg 影像）。" +"目前使用的選單檔案格式未被此工具支援。\n" +"你要拋棄目前選單以便使用此工具？" -#: ../../WPrefs.app/MenuGuru.c:415 -msgid "" -"If the directory contain data files, type the command used to open these " -"files. Otherwise, leave it in blank." -msgstr "如果目錄含有資料檔，輸入用來開啟這些檔案的命令。否則，留空白。" +#: ../../WPrefs.app/Menu.c:1616 +msgid "Yes, Discard and Update" +msgstr "是，拋棄並更新" + +#: ../../WPrefs.app/Menu.c:1617 +msgid "No, Keep Current Menu" +msgstr "否，保留目前選單" -#: ../../WPrefs.app/MenuGuru.c:426 -msgid "" -"Each file in the directory will have an item and they will be opened with " -"the supplied command.For example, if the directory contains image files and " -"the command is \"xv -root\", each file in the directory will have a menu " -"item like \"xv -root imagefile\"." -msgstr "" -"目錄中的每一個檔案會有一個項目且會以提供的命令開啟。舉例來說，如果目錄含有影" -"鹿犮B命令是 \"xv -root\"，目錄中的每一個檔案會有一個像 \"xv -root " -"imagefile\" 的項目。" +#: ../../WPrefs.app/Menu.c:1880 +msgid "Applications Menu Definition" +msgstr "應用程式選單定義" -#: ../../WPrefs.app/MenuPreferences.c:112 +#: ../../WPrefs.app/Menu.c:1882 +msgid "Edit the menu for launching applications." +msgstr "編輯啟動應用程式的選單。" + +#: ../../WPrefs.app/MenuPreferences.c:111 msgid "Menu Scrolling Speed" msgstr "選單捲動速度" -#: ../../WPrefs.app/MenuPreferences.c:161 +#: ../../WPrefs.app/MenuPreferences.c:160 msgid "Submenu Alignment" msgstr "副選單對齊" #: ../../WPrefs.app/MenuPreferences.c:204 msgid "" "Always open submenus inside the screen, instead of scrolling.\n" -"Note: this can be an annoyance at some circumstances." +"Note: this is annoying." msgstr "" "每次都在螢幕內開啟副選單，而不是捲動。\n" -"註：在一些情況下會令人生厭。" +"註：會令人生厭。" #: ../../WPrefs.app/MenuPreferences.c:209 msgid "Scroll off-screen menus when pointer is moved over them." @@ -794,359 +1256,423 @@ msgid "Menu Preferences" msgstr "選單設定" -#: ../../WPrefs.app/MouseSettings.c:147 +#: ../../WPrefs.app/MenuPreferences.c:231 +msgid "" +"Menu usability related options. Scrolling speed,\n" +"alignment of submenus etc." +msgstr "" +"選單可用性相關選項。\n" +"捲動速度、副選單對齊等。" + +#: ../../WPrefs.app/MouseSettings.c:141 msgid "Invalid mouse acceleration value. Must be a positive real value." msgstr "滑鼠加速限度值無效。必須是一正實數值。" -#: ../../WPrefs.app/MouseSettings.c:170 +#: ../../WPrefs.app/MouseSettings.c:161 msgid "" "Invalid mouse acceleration threshold value. Must be the number of pixels to " "travel before accelerating." msgstr "滑鼠加速限度值無效。必須是加速前移動的像素數目。" -#: ../../WPrefs.app/MouseSettings.c:225 -#, c-format -msgid "mouse button %s not supported by WPrefs." -msgstr "滑鼠按鈕 %s 未被 WPrefs 支援" - -#: ../../WPrefs.app/MouseSettings.c:259 ../../WPrefs.app/MouseSettings.c:270 -#: ../../WPrefs.app/MouseSettings.c:281 +#: ../../WPrefs.app/MouseSettings.c:262 ../../WPrefs.app/MouseSettings.c:274 +#: ../../WPrefs.app/MouseSettings.c:286 ../../WPrefs.app/MouseSettings.c:298 #, c-format msgid "bad value %s for option %s" msgstr "選項 %s 的值 %s 錯誤" -#: ../../WPrefs.app/MouseSettings.c:341 +#: ../../WPrefs.app/MouseSettings.c:357 #, c-format msgid "" "modifier key %s for option ModifierKey was not recognized. Using %s as " "default" msgstr "ModifierKey 選項的修正鍵 %s 無法辨認。使用 %s 為預設值" -#: ../../WPrefs.app/MouseSettings.c:366 +#: ../../WPrefs.app/MouseSettings.c:382 msgid "could not retrieve keyboard modifier mapping" msgstr "無法取回鍵盤修正對應" -#: ../../WPrefs.app/MouseSettings.c:513 +#: ../../WPrefs.app/MouseSettings.c:477 msgid "Mouse Speed" msgstr "滑鼠速度" -#: ../../WPrefs.app/MouseSettings.c:575 +#: ../../WPrefs.app/MouseSettings.c:507 msgid "Acceler.:" msgstr "加速值:" -#: ../../WPrefs.app/MouseSettings.c:587 +#: ../../WPrefs.app/MouseSettings.c:520 msgid "Threshold:" msgstr "限度：" -#: ../../WPrefs.app/MouseSettings.c:602 +#: ../../WPrefs.app/MouseSettings.c:535 msgid "Double-Click Delay" msgstr "連按兩下延遲" -#: ../../WPrefs.app/MouseSettings.c:646 +#: ../../WPrefs.app/MouseSettings.c:579 msgid "Test" msgstr "測試" -#: ../../WPrefs.app/MouseSettings.c:656 +#: ../../WPrefs.app/MouseSettings.c:609 msgid "Workspace Mouse Actions" msgstr "工作區滑鼠動作" -#: ../../WPrefs.app/MouseSettings.c:661 +#: ../../WPrefs.app/MouseSettings.c:614 msgid "Disable mouse actions" msgstr "使滑鼠動作失效" -#: ../../WPrefs.app/MouseSettings.c:714 -msgid "Applications menu" -msgstr "應用程視選單" +#: ../../WPrefs.app/MouseSettings.c:620 +msgid "Left Button" +msgstr "左按鈕" + +#: ../../WPrefs.app/MouseSettings.c:630 +msgid "Middle Button" +msgstr "中間鈕" + +#: ../../WPrefs.app/MouseSettings.c:640 +msgid "Right Button" +msgstr "右按鈕" + +#: ../../WPrefs.app/MouseSettings.c:650 +msgid "Mouse Wheel" +msgstr "滑鼠滾輪" -#: ../../WPrefs.app/MouseSettings.c:720 -msgid "Window list menu" -msgstr "視窗清單選單" - -#: ../../WPrefs.app/MouseSettings.c:726 -msgid "Select windows" -msgstr "選取視窗" - -#: ../../WPrefs.app/MouseSettings.c:761 +#: ../../WPrefs.app/MouseSettings.c:672 msgid "Mouse Grab Modifier" msgstr "滑鼠抓取修飾" -#: ../../WPrefs.app/MouseSettings.c:795 +#: ../../WPrefs.app/MouseSettings.c:674 +msgid "" +"Keyboard modifier to use for actions that\n" +"involve dragging windows with the mouse,\n" +"clicking inside the window." +msgstr "" +"用來連同以滑鼠拖曳視窗、在視窗中點選使用的鍵盤修飾。" + +#: ../../WPrefs.app/MouseSettings.c:708 #, c-format msgid "could not create %s" msgstr "無法建立 %s" -#: ../../WPrefs.app/MouseSettings.c:811 +#: ../../WPrefs.app/MouseSettings.c:724 #, c-format msgid "could not create temporary file %s" msgstr "無法建立暫存檔 %s" -#: ../../WPrefs.app/MouseSettings.c:836 +#: ../../WPrefs.app/MouseSettings.c:756 #, c-format msgid "could not rename file %s to %s\n" msgstr "無法變更檔名 %s 至 %s\n" -#: ../../WPrefs.app/MouseSettings.c:919 +#: ../../WPrefs.app/MouseSettings.c:829 +msgid "Shift" +msgstr "Shift" + +#: ../../WPrefs.app/MouseSettings.c:830 +msgid "Lock" +msgstr "Lock" + +#: ../../WPrefs.app/MouseSettings.c:831 +msgid "Control" +msgstr "Control" + +#: ../../WPrefs.app/MouseSettings.c:832 +msgid "Mod1" +msgstr "Mod1" + +#: ../../WPrefs.app/MouseSettings.c:833 +msgid "Mod2" +msgstr "Mod2" + +#: ../../WPrefs.app/MouseSettings.c:834 +msgid "Mod3" +msgstr "Mod3" + +#: ../../WPrefs.app/MouseSettings.c:835 +msgid "Mod4" +msgstr "Mod4" + +#: ../../WPrefs.app/MouseSettings.c:836 +msgid "Mod5" +msgstr "Mod5" + +#: ../../WPrefs.app/MouseSettings.c:839 +msgid "Applications Menu" +msgstr "應用程式選單" + +#: ../../WPrefs.app/MouseSettings.c:841 +msgid "Select Windows" +msgstr "選取視窗" + +#: ../../WPrefs.app/MouseSettings.c:844 +msgid "Switch Workspaces" +msgstr "切換至工作區" + +#: ../../WPrefs.app/MouseSettings.c:849 msgid "Mouse Preferences" msgstr "滑鼠設定" -#: ../../WPrefs.app/Paths.c:82 +#: ../../WPrefs.app/MouseSettings.c:851 +msgid "" +"Mouse speed/acceleration, double click delay,\n" +"mouse button bindings etc." +msgstr "" +"滑鼠速度/加速、連按兩下之延遲、滑鼠按鈕結合等。" + +#: ../../WPrefs.app/Paths.c:85 msgid "bad value in option IconPath. Using default path list" msgstr "IconPath 選項的值錯誤。使用預設路徑清單" -#: ../../WPrefs.app/Paths.c:99 +#: ../../WPrefs.app/Paths.c:102 msgid "bad value in option PixmapPath. Using default path list" msgstr "PixmapPath 選項的值錯誤。使用預設路徑清單" -#: ../../WPrefs.app/Paths.c:302 +#: ../../WPrefs.app/Paths.c:150 +msgid "Select directory" +msgstr "選取目錄" + +#: ../../WPrefs.app/Paths.c:266 msgid "Icon Search Paths" msgstr "圖示搜尋路徑" -#: ../../WPrefs.app/Paths.c:314 ../../WPrefs.app/Paths.c:350 +#: ../../WPrefs.app/Paths.c:277 ../../WPrefs.app/Paths.c:308 +#: ../../WPrefs.app/TexturePanel.c:1312 msgid "Add" msgstr "新增" -#: ../../WPrefs.app/Paths.c:321 ../../WPrefs.app/Paths.c:357 +#: ../../WPrefs.app/Paths.c:284 ../../WPrefs.app/Paths.c:315 msgid "Remove" msgstr "刪除" -#: ../../WPrefs.app/Paths.c:338 +#: ../../WPrefs.app/Paths.c:297 msgid "Pixmap Search Paths" msgstr "Pixmap 搜尋路徑" -#: ../../WPrefs.app/Paths.c:386 +#: ../../WPrefs.app/Paths.c:337 msgid "Search Path Configuration" msgstr "搜尋路徑設定" -#: ../../WPrefs.app/Preferences.c:151 +#: ../../WPrefs.app/Paths.c:339 +msgid "" +"Search paths to use when looking for pixmaps\n" +"and icons." +msgstr "" +"當尋找 pixmap 或圖示時使用的搜尋路徑。" + +#: ../../WPrefs.app/Preferences.c:75 +#, c-format +msgid "OFF" +msgstr "關閉" + +#: ../../WPrefs.app/Preferences.c:77 +#, c-format +msgid "1 pixel" +msgstr "一個像素" + +#. 2-4 +#: ../../WPrefs.app/Preferences.c:80 +#, c-format +msgid "%i pixels" +msgstr "%i 個像素" + +#. >4 +#: ../../WPrefs.app/Preferences.c:83 +#, c-format +msgid "%i pixels " +msgstr "%i 個像素 " + +#: ../../WPrefs.app/Preferences.c:229 msgid "Size Display" msgstr "視窗大小顯示" -#: ../../WPrefs.app/Preferences.c:156 ../../WPrefs.app/Preferences.c:172 +#: ../../WPrefs.app/Preferences.c:231 +msgid "" +"The position or style of the window size\n" +"display that's shown when a window is resized." +msgstr "" +"當視窗大小變更時所顯示之視窗大小顯示裝置的位置或風格。" + +#: ../../WPrefs.app/Preferences.c:238 ../../WPrefs.app/Preferences.c:259 msgid "Corner of screen" msgstr "螢幕角落" -#: ../../WPrefs.app/Preferences.c:157 ../../WPrefs.app/Preferences.c:173 +#: ../../WPrefs.app/Preferences.c:239 ../../WPrefs.app/Preferences.c:260 msgid "Center of screen" msgstr "螢幕中央" -#: ../../WPrefs.app/Preferences.c:158 ../../WPrefs.app/Preferences.c:174 +#: ../../WPrefs.app/Preferences.c:240 ../../WPrefs.app/Preferences.c:261 msgid "Center of resized window" msgstr "視窗中央" -#: ../../WPrefs.app/Preferences.c:159 +#: ../../WPrefs.app/Preferences.c:241 msgid "Technical drawing-like" msgstr "科學繪圖方式" -#: ../../WPrefs.app/Preferences.c:167 +#: ../../WPrefs.app/Preferences.c:242 ../../WPrefs.app/Preferences.c:262 +msgid "Disabled" +msgstr "已失效" + +#: ../../WPrefs.app/Preferences.c:250 msgid "Position Display" msgstr "位置顯示" -#: ../../WPrefs.app/Preferences.c:182 +#: ../../WPrefs.app/Preferences.c:252 +msgid "" +"The position or style of the window position\n" +"display that's shown when a window is moved." +msgstr "" +"當視窗移動時所顯示之視窗位置顯示裝置的位置或風格。" + +#: ../../WPrefs.app/Preferences.c:270 msgid "Show balloon text for..." msgstr "顯示氣球文字..." -#: ../../WPrefs.app/Preferences.c:189 +#: ../../WPrefs.app/Preferences.c:277 msgid "incomplete window titles" msgstr "不完整視窗標題" -#: ../../WPrefs.app/Preferences.c:190 +#: ../../WPrefs.app/Preferences.c:278 msgid "miniwindow titles" msgstr "小視窗標題" -#: ../../WPrefs.app/Preferences.c:191 +#: ../../WPrefs.app/Preferences.c:279 msgid "application/dock icons" msgstr "應用程式/停靠區圖示" -#: ../../WPrefs.app/Preferences.c:204 -msgid "Raise window when switching focus with keyboard (CirculateRaise)." -msgstr "當使用鍵盤切換焦點時升起視窗" - -#: ../../WPrefs.app/Preferences.c:210 -msgid "Keep keyboard language status for each window." -msgstr "為每個視窗保持鍵盤語言狀態" +#: ../../WPrefs.app/Preferences.c:280 +msgid "internal help" +msgstr "內部說明" -#: ../../WPrefs.app/Preferences.c:231 -msgid "Miscellaneous Ergonomic Preferences" -msgstr "其他操作性設定" +#: ../../WPrefs.app/Preferences.c:292 +msgid "" +"Raise window when switching\n" +"focus with keyboard." +msgstr "當使用鍵盤切換焦點時升起視窗。" -#: ../../WPrefs.app/Text.c:179 -#, c-format -msgid "Invalid font %s." -msgstr "無效的字型 %s。" +#: ../../WPrefs.app/Preferences.c:298 +msgid "" +"Enable keyboard language\n" +"switch button in window titlebars." +msgstr "在視窗標題列啟用語言切換鈕。" -#: ../../WPrefs.app/Text.c:256 -msgid "Set Font..." -msgstr "設定字型..." +#: ../../WPrefs.app/Preferences.c:307 +msgid "Workspace border" +msgstr "工作區邊框" -#: ../../WPrefs.app/Text.c:262 -msgid "Window Title Font" -msgstr "視窗標題字型" +#: ../../WPrefs.app/Preferences.c:323 +msgid "Left/Right" +msgstr "左/右" -#: ../../WPrefs.app/Text.c:263 -msgid "Menu Title Font" -msgstr "選單標題字型" +#: ../../WPrefs.app/Preferences.c:328 +msgid "Top/Bottom" +msgstr "上/下" -#: ../../WPrefs.app/Text.c:264 -msgid "Menu Item Font" -msgstr "選單項目字型" +#: ../../WPrefs.app/Preferences.c:349 +msgid "Miscellaneous Ergonomic Preferences" +msgstr "其他操作性設定" -#: ../../WPrefs.app/Text.c:265 -msgid "Icon Title Font" -msgstr "圖示標題字型" +#: ../../WPrefs.app/Preferences.c:350 +msgid "" +"Various settings like balloon text, geometry\n" +"displays etc." +msgstr "" +"各種設定像是氣球文字、位置顯示等。" -#: ../../WPrefs.app/Text.c:266 -msgid "Clip Title Font" -msgstr "迴紋針標題字型" +#: ../../WPrefs.app/TexturePanel.c:323 +msgid "Saturation" +msgstr "濃度" -#: ../../WPrefs.app/Text.c:267 -msgid "Geometry Display Font" -msgstr "位置表示字型" +#: ../../WPrefs.app/TexturePanel.c:325 +msgid "Brightness" +msgstr "亮度" -#: ../../WPrefs.app/Text.c:280 -msgid "" -"Sample Text\n" -"abcdefghijklmnopqrstuvxywz\n" -"ABCDEFGHIJKLMNOPQRSTUVXYWZ\n" -"0123456789" -msgstr "" -"範例文字\n" -"abcdefghijklmn...ㄅㄆㄇㄈㄉ\n" -"ABCDEFGHIJKLMN...視窗管理員\n" -"123...一二三" +#: ../../WPrefs.app/TexturePanel.c:373 ../../WPrefs.app/TexturePanel.c:380 +msgid "Hue" +msgstr "色調" -#: ../../WPrefs.app/Text.c:285 -msgid "Alignment" -msgstr "對齊" +#: ../../WPrefs.app/TexturePanel.c:612 +msgid "Could not load the selected file: " +msgstr "無法載入選取的檔案: " -#: ../../WPrefs.app/Text.c:290 -msgid "Left" -msgstr "靠左" +#: ../../WPrefs.app/TexturePanel.c:666 +msgid "Open Image" +msgstr "開啟影像" -#: ../../WPrefs.app/Text.c:296 -msgid "Center" -msgstr "置中" +#: ../../WPrefs.app/TexturePanel.c:696 +msgid "The selected file does not contain a supported image." +msgstr "選取的檔案未含有支援的影像。" -#: ../../WPrefs.app/Text.c:303 -msgid "Right" -msgstr "靠右" +#: ../../WPrefs.app/TexturePanel.c:947 +#, c-format +msgid "could not load file '%s': %s" +msgstr "無法載入檔案 '%s': %s" -#: ../../WPrefs.app/Text.c:325 -msgid "Text Preferences" -msgstr "文字設定" - -#: ../../WPrefs.app/TextureAndColor.c:384 -msgid "Window Title Bar" -msgstr "視窗標題列" +#: ../../WPrefs.app/TexturePanel.c:1066 +#, c-format +msgid "error creating texture %s" +msgstr "建立材質 %s 錯誤" -#: ../../WPrefs.app/TextureAndColor.c:385 -msgid "Menu Title Bar" -msgstr "選單標題列" +#: ../../WPrefs.app/TexturePanel.c:1256 +msgid "Texture Panel" +msgstr "材質面板" -#: ../../WPrefs.app/TextureAndColor.c:386 -msgid "Menu Items" -msgstr "選單項目" +#: ../../WPrefs.app/TexturePanel.c:1264 +msgid "Texture Name" +msgstr "材質名稱" -#: ../../WPrefs.app/TextureAndColor.c:387 -msgid "Workspace/Clip" -msgstr "工作區/迴紋真" - -#: ../../WPrefs.app/TextureAndColor.c:388 -msgid "Icons" -msgstr "圖示" +#: ../../WPrefs.app/TexturePanel.c:1276 +msgid "Solid Color" +msgstr "純色彩" -#: ../../WPrefs.app/TextureAndColor.c:399 -msgid "Focused Window" -msgstr "焦點視窗" +#: ../../WPrefs.app/TexturePanel.c:1277 +msgid "Gradient Texture" +msgstr "漸層材質" -#: ../../WPrefs.app/TextureAndColor.c:412 -#: ../../WPrefs.app/TextureAndColor.c:443 -#: ../../WPrefs.app/TextureAndColor.c:474 -msgid "Texture" -msgstr "材質" +#: ../../WPrefs.app/TexturePanel.c:1278 +msgid "Simple Gradient Texture" +msgstr "簡單 漸層材質" -#: ../../WPrefs.app/TextureAndColor.c:418 -#: ../../WPrefs.app/TextureAndColor.c:449 -#: ../../WPrefs.app/TextureAndColor.c:480 -msgid "Text Color" -msgstr "文字色彩" - -#: ../../WPrefs.app/TextureAndColor.c:423 -#: ../../WPrefs.app/TextureAndColor.c:454 -#: ../../WPrefs.app/TextureAndColor.c:485 -#: ../../WPrefs.app/TextureAndColor.c:509 -#: ../../WPrefs.app/TextureAndColor.c:575 -#: ../../WPrefs.app/TextureAndColor.c:652 -msgid "Set..." -msgstr "設定..." +#: ../../WPrefs.app/TexturePanel.c:1279 +msgid "Textured Gradient" +msgstr "材質漸層" -#: ../../WPrefs.app/TextureAndColor.c:430 -msgid "Unfocused Window" -msgstr "非焦點視窗" +#: ../../WPrefs.app/TexturePanel.c:1280 +msgid "Image Texture" +msgstr "影像材質" -#: ../../WPrefs.app/TextureAndColor.c:461 -msgid "Owner of Focused Window" -msgstr "焦點視窗擁有者" +#: ../../WPrefs.app/TexturePanel.c:1288 +msgid "Default Color" +msgstr "預設色彩" -#: ../../WPrefs.app/TextureAndColor.c:494 -msgid "Unselected Items" -msgstr "未選取項目" +#: ../../WPrefs.app/TexturePanel.c:1300 +msgid "Gradient Colors" +msgstr "漸層色彩" -#: ../../WPrefs.app/TextureAndColor.c:504 -#: ../../WPrefs.app/TextureAndColor.c:558 -msgid "Background" -msgstr "背景" +#: ../../WPrefs.app/TexturePanel.c:1396 +msgid "Direction" +msgstr "方向" -#: ../../WPrefs.app/TextureAndColor.c:519 -msgid "Normal Text" -msgstr "正常文字" - -#: ../../WPrefs.app/TextureAndColor.c:529 -msgid "Disabled Text" -msgstr "失效文字" - -#: ../../WPrefs.app/TextureAndColor.c:538 -msgid "Selected Items" -msgstr "選取項目" - -#: ../../WPrefs.app/TextureAndColor.c:548 -msgid "Text" -msgstr "文字" - -#: ../../WPrefs.app/TextureAndColor.c:566 -msgid "Menu Title Background" -msgstr "選單標題背景" - -#: ../../WPrefs.app/TextureAndColor.c:584 -msgid "Menu Title Text" -msgstr "選單標題文字" - -#: ../../WPrefs.app/TextureAndColor.c:596 -msgid "Workspace Background" -msgstr "工作區背景" - -#: ../../WPrefs.app/TextureAndColor.c:605 -msgid "Change" -msgstr "改變" - -#: ../../WPrefs.app/TextureAndColor.c:611 -msgid "Clip Title Text" -msgstr "迴文針標題文字" - -#: ../../WPrefs.app/TextureAndColor.c:621 -msgid "Normal" -msgstr "正常" - -#: ../../WPrefs.app/TextureAndColor.c:631 -msgid "Collapsed" -msgstr "折疊" +#: ../../WPrefs.app/TexturePanel.c:1424 +msgid "Gradient" +msgstr "漸層" -#: ../../WPrefs.app/TextureAndColor.c:643 -msgid "Icon Background" -msgstr "圖示背景" +#: ../../WPrefs.app/TexturePanel.c:1442 +msgid "Gradient Opacity" +msgstr "漸層不透明度" + +#: ../../WPrefs.app/TexturePanel.c:1484 +msgid "Image" +msgstr "影像" + +#: ../../WPrefs.app/TexturePanel.c:1516 +msgid "Tile" +msgstr "並排" + +#: ../../WPrefs.app/TexturePanel.c:1517 +msgid "Scale" +msgstr "縮放" -#: ../../WPrefs.app/TextureAndColor.c:677 -msgid "Texture and Color Preferences" -msgstr "材質與色彩設定" +#: ../../WPrefs.app/TexturePanel.c:1519 +msgid "Maximize" +msgstr "最大化" #: ../../WPrefs.app/Themes.c:71 ../../WPrefs.app/Themes.c:82 msgid "Set" @@ -1156,136 +1682,112 @@ msgid "Stop" msgstr "停止" -#: ../../WPrefs.app/Themes.c:143 ../../WPrefs.app/Themes.c:205 -#: ../../WPrefs.app/Themes.c:225 +#: ../../WPrefs.app/Themes.c:143 ../../WPrefs.app/Themes.c:203 +#: ../../WPrefs.app/Themes.c:223 msgid "Download" msgstr "下載" -#: ../../WPrefs.app/Themes.c:173 +#: ../../WPrefs.app/Themes.c:171 msgid "Save Current Theme" msgstr "儲存目前主題" -#: ../../WPrefs.app/Themes.c:182 +#: ../../WPrefs.app/Themes.c:180 msgid "Load" msgstr "載入" -#: ../../WPrefs.app/Themes.c:187 +#: ../../WPrefs.app/Themes.c:185 msgid "Install" msgstr "安裝" -#: ../../WPrefs.app/Themes.c:195 +#: ../../WPrefs.app/Themes.c:193 msgid "Tile of The Day" msgstr "本日標題" -#: ../../WPrefs.app/Themes.c:215 +#: ../../WPrefs.app/Themes.c:213 msgid "Bar of The Day" msgstr "本日標題列" -#: ../../WPrefs.app/Themes.c:252 -msgid "Themes" -msgstr "主題" - -#: ../../WPrefs.app/WPrefs.c:201 +#: ../../WPrefs.app/WPrefs.c:260 ../../WPrefs.app/WPrefs.c:331 msgid "Window Maker Preferences" msgstr "Window Maker 設定" -#: ../../WPrefs.app/WPrefs.c:225 +#: ../../WPrefs.app/WPrefs.c:283 msgid "Revert Page" msgstr "還原" -#: ../../WPrefs.app/WPrefs.c:231 +#: ../../WPrefs.app/WPrefs.c:289 msgid "Revert All" msgstr "全部還原" -#: ../../WPrefs.app/WPrefs.c:237 +#: ../../WPrefs.app/WPrefs.c:295 msgid "Save" msgstr "儲存" -#: ../../WPrefs.app/WPrefs.c:243 -msgid "Close" -msgstr "關閉" - -#: ../../WPrefs.app/WPrefs.c:260 -msgid "Window Maker Preferences Utility" -msgstr "Window Maker 設定公用程式" +#: ../../WPrefs.app/WPrefs.c:308 +msgid "Balloon Help" +msgstr "氣球說明" -#: ../../WPrefs.app/WPrefs.c:267 +#: ../../WPrefs.app/WPrefs.c:338 #, c-format -msgid "Version %s for Window Maker %s" -msgstr "Window Maker %s 用版本 %s" +msgid "Version %s" +msgstr "版本 %s" -#: ../../WPrefs.app/WPrefs.c:274 +#: ../../WPrefs.app/WPrefs.c:345 msgid "Starting..." msgstr "啟動中..." -#: ../../WPrefs.app/WPrefs.c:280 -msgid "" -"Programming/Design: Alfredo K. Kojima\n" -"Artwork: Marco van Hylckama Vlieg\n" -"More Programming: James Thompson" -msgstr "" -"程式/設計：Alfredo K. Kojima\n" -"美術：Marco van Hylckama Vlieg\n" -"程式：James Thompson" - -#: ../../WPrefs.app/WPrefs.c:368 +#: ../../WPrefs.app/WPrefs.c:443 #, c-format msgid "could not locate image file %s\n" msgstr "無法找出影像檔 %s\n" -#: ../../WPrefs.app/WPrefs.c:474 +#: ../../WPrefs.app/WPrefs.c:656 #, c-format msgid "could not load image file %s:%s" msgstr "無法載入影像檔 %s:%s" -#: ../../WPrefs.app/WPrefs.c:493 +#: ../../WPrefs.app/WPrefs.c:674 msgid "Loading Window Maker configuration files..." msgstr "載入 Window Maker 設定檔..." -#: ../../WPrefs.app/WPrefs.c:497 +#: ../../WPrefs.app/WPrefs.c:678 msgid "Initializing configuration panels..." msgstr "啟始設定面板..." -#: ../../WPrefs.app/WPrefs.c:525 -msgid "" -"WPrefs is free software and is distributed WITHOUT ANY WARRANTY under the " -"terms of the GNU General Public License. Redistribution of the icons in this " -"program separately from the program is prohibited." -msgstr "" -"WPrefs 是自由軟體且在 GNU General Public License " -"條款下無任何保証地發送。禁止單獨重新發送這程式中的圖示" - -#: ../../WPrefs.app/WPrefs.c:557 ../../WPrefs.app/WPrefs.c:613 +#: ../../WPrefs.app/WPrefs.c:739 ../../WPrefs.app/WPrefs.c:819 #, c-format msgid "Window Maker domain (%s) is corrupted!" msgstr "Window Maker 定義域 (%s) 已損壞！" -#: ../../WPrefs.app/WPrefs.c:561 +#: ../../WPrefs.app/WPrefs.c:743 #, c-format msgid "Could not load Window Maker domain (%s) from defaults database." msgstr "無法從預設資料庫載入 Window Maker 定義域 (%s)" -#: ../../WPrefs.app/WPrefs.c:569 +#: ../../WPrefs.app/WPrefs.c:759 msgid "could not extract version information from Window Maker" msgstr "無法得知 Window Maker 的版本資訊" -#: ../../WPrefs.app/WPrefs.c:570 +#: ../../WPrefs.app/WPrefs.c:760 msgid "Make sure wmaker is in your search path." -msgstr "確定 wmaker 在您的搜尋路徑中。" +msgstr "確定 wmaker 在你的搜尋路徑中。" -#: ../../WPrefs.app/WPrefs.c:573 +#: ../../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 的版本。確定它安裝正確且在您的 PATH 環境變數中。" +msgstr "無法得知 Window Maker 的版本。確定它安裝正確且在你的 PATH 環境變數中。" -#: ../../WPrefs.app/WPrefs.c:583 +#: ../../WPrefs.app/WPrefs.c:773 msgid "" "Could not extract version from Window Maker. Make sure it is correctly " -"installed." -msgstr "無法得知 Window Maker 的版本。確定它安裝正確。" +"installed and the path where it installed is in the PATH environment " +"variable." +msgstr "" +"無法從 Window Maker 取得版本。" +"確定它安裝正確且它的安裝路徑在PATH 環境變數中。" -#: ../../WPrefs.app/WPrefs.c:588 +#: ../../WPrefs.app/WPrefs.c:780 #, c-format msgid "" "WPrefs only supports Window Maker 0.18.0 or newer.\n" @@ -1294,23 +1796,24 @@ "WPrefs 只支援 Window Maker 0.18.0 或更新版本。\n" "安裝的版本是 %i.%i.%i\n" -#: ../../WPrefs.app/WPrefs.c:595 +#: ../../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 "在您的系統中安裝的 Window Maker %i.%i.%i 不完全支援這版本的 WPrefs。" +msgstr "在你的系統中安裝的 Window Maker %i.%i.%i 不完全支援這版本的 WPrefs。" -#: ../../WPrefs.app/WPrefs.c:602 -msgid "could not run \"wmaker --global_defaults_path\"." -msgstr "無法執行 \"wmaker -global_defaults_path\"。" +#: ../../WPrefs.app/WPrefs.c:800 +#, c-format +msgid "could not run \"%s --global_defaults_path\"." +msgstr "無法執行 \"%s --global_defaults_path\"。" -#: ../../WPrefs.app/WPrefs.c:617 +#: ../../WPrefs.app/WPrefs.c:823 #, c-format msgid "Could not load global Window Maker domain (%s)." msgstr "無法載入整體 Window Maker 定義域 (%s)。" -#: ../../WPrefs.app/WPrefs.c:863 +#: ../../WPrefs.app/WPrefs.c:1072 #, c-format msgid "" "bad speed value for option %s\n" @@ -1319,137 +1822,555 @@ "%s 選項速度值錯誤。\n" "使用預設值" -#: ../../WPrefs.app/WindowHandling.c:108 +#: ../../WPrefs.app/WindowHandling.c:141 #, c-format msgid "bad option value %s in WindowPlacement. Using default value" msgstr "WindowPlacement 選項 %s 資料錯誤。使用預設值" -#: ../../WPrefs.app/WindowHandling.c:130 +#: ../../WPrefs.app/WindowHandling.c:163 msgid "invalid data in option WindowPlaceOrigin. Using default (0,0)" msgstr "WindowPlaceOrigin 選項中資料無效。使用預設之 (0,0)" -#: ../../WPrefs.app/WindowHandling.c:192 +#: ../../WPrefs.app/WindowHandling.c:243 msgid "Window Placement" msgstr "視窗放置" -#: ../../WPrefs.app/WindowHandling.c:197 +#: ../../WPrefs.app/WindowHandling.c:244 +msgid "" +"How to place windows when they are first put\n" +"on screen." +msgstr "" +"當第一次放到螢幕上時如何放置視窗。" + +#: ../../WPrefs.app/WindowHandling.c:250 msgid "Automatic" msgstr "自動" -#: ../../WPrefs.app/WindowHandling.c:198 +#: ../../WPrefs.app/WindowHandling.c:251 msgid "Random" msgstr "隨意" -#: ../../WPrefs.app/WindowHandling.c:199 +#: ../../WPrefs.app/WindowHandling.c:252 msgid "Manual" msgstr "手動" -#: ../../WPrefs.app/WindowHandling.c:200 +#: ../../WPrefs.app/WindowHandling.c:253 msgid "Cascade" msgstr "重疊" -#: ../../WPrefs.app/WindowHandling.c:206 +#: ../../WPrefs.app/WindowHandling.c:254 +msgid "Smart" +msgstr "精明" + +#: ../../WPrefs.app/WindowHandling.c:260 msgid "Placement Origin" msgstr "放置基準點" -#: ../../WPrefs.app/WindowHandling.c:260 +#: ../../WPrefs.app/WindowHandling.c:321 msgid "Opaque Move" msgstr "不透明移動" -#: ../../WPrefs.app/WindowHandling.c:296 +#: ../../WPrefs.app/WindowHandling.c:322 +msgid "" +"Whether the window contents should be moved\n" +"when dragging windows aroung or if only a\n" +"frame should be displayed.\n" +msgstr "" +"當到處拖曳視窗時\n" +"視窗內容是否該被移動\n" +"或只有框線被顯示。\n" + +#: ../../WPrefs.app/WindowHandling.c:361 msgid "When maximizing..." msgstr "當最大化時..." -#: ../../WPrefs.app/WindowHandling.c:301 -msgid "...do not resize over icons" -msgstr "...不要超過圖示區" - -#: ../../WPrefs.app/WindowHandling.c:307 -msgid "...do not resize over dock" -msgstr "...不要超過停靠區" - -#: ../../WPrefs.app/WindowHandling.c:320 -msgid "Open transients in same workspace as their owners" -msgstr "保持確認、警告等視窗在擁有者之上" +#: ../../WPrefs.app/WindowHandling.c:366 +msgid "...do not cover icons" +msgstr "...不要覆蓋圖示區" + +#: ../../WPrefs.app/WindowHandling.c:372 +msgid "...do not cover dock" +msgstr "...不要覆蓋停靠區" + +#: ../../WPrefs.app/WindowHandling.c:381 +msgid "Edge Resistance" +msgstr "邊緣抵抗" + +#: ../../WPrefs.app/WindowHandling.c:383 +msgid "" +"Edge resistance will make windows `resist'\n" +"being moved further for the defined threshold\n" +"when moved against other windows or the edges\n" +"of the screen." +msgstr "" +"當朝著其他視窗或螢幕邊緣移動時，\n" +"邊緣抵抗會使視窗「抵抗」\n" +"被進一步移動超過定義的限度。" + +#: ../../WPrefs.app/WindowHandling.c:402 +msgid "Resist" +msgstr "抵抗" + +#: ../../WPrefs.app/WindowHandling.c:407 +msgid "Attract" +msgstr "吸引" + +#: ../../WPrefs.app/WindowHandling.c:421 +msgid "" +"Open dialogs in the same workspace\n" +"as their owners" +msgstr "開啟對話視窗在其擁有者之相同工作區" -#: ../../WPrefs.app/WindowHandling.c:347 +#: ../../WPrefs.app/WindowHandling.c:448 msgid "Window Handling Preferences" msgstr "視窗操作設定" -#: ../../WPrefs.app/Workspace.c:137 +#: ../../WPrefs.app/WindowHandling.c:450 +msgid "" +"Window handling options. Initial placement style\n" +"edge resistance, opaque move etc." +msgstr "" +"視窗處理選項。起始放置風格\n" +"邊緣抵抗、不透明移動等。" + +#: ../../WPrefs.app/Workspace.c:176 msgid "Workspace Navigation" msgstr "工作區之操作" -#: ../../WPrefs.app/Workspace.c:161 -msgid "drag windows between workspaces." -msgstr "在工作區之間拖曳視窗。" +#: ../../WPrefs.app/Workspace.c:183 +msgid "Wrap to the first workspace from the last workspace." +msgstr "從最後一個工作區跳至第一個工作區。" + +#: ../../WPrefs.app/Workspace.c:205 +msgid "Switch workspaces while dragging windows." +msgstr "當拖曳視窗時切換工作區。" + +#: ../../WPrefs.app/Workspace.c:227 +msgid "Automatically create new workspaces." +msgstr "自動建立新工作區。" -#: ../../WPrefs.app/Workspace.c:186 +#: ../../WPrefs.app/Workspace.c:250 msgid "" -"switch to first workspace when switching past the last workspace and " -"vice-versa" -msgstr "當切換超過最後一個工作區時切換至第一個工作區，反之亦然。" +"Position of workspace\n" +"name display" +msgstr "" +"工作區名稱顯示的位置" + +#: ../../WPrefs.app/Workspace.c:269 +msgid "Disable" +msgstr "停用" + +#: ../../WPrefs.app/Workspace.c:271 +msgid "Top" +msgstr "上" + +#: ../../WPrefs.app/Workspace.c:272 +msgid "Bottom" +msgstr "下" -#: ../../WPrefs.app/Workspace.c:210 -msgid "create a new workspace when switching past the last workspace." -msgstr "當切換超過最後一個工作區時建立新的工作區。" +#: ../../WPrefs.app/Workspace.c:273 +msgid "Top/Left" +msgstr "上/左" -#: ../../WPrefs.app/Workspace.c:218 +#: ../../WPrefs.app/Workspace.c:274 +msgid "Top/Right" +msgstr "上/右" + +#: ../../WPrefs.app/Workspace.c:275 +msgid "Bottom/Left" +msgstr "下/左" + +#: ../../WPrefs.app/Workspace.c:276 +msgid "Bottom/Right" +msgstr "下/右" + +#: ../../WPrefs.app/Workspace.c:284 msgid "Dock/Clip" msgstr "停靠區/迴紋針" -#: ../../WPrefs.app/Workspace.c:287 +#: ../../WPrefs.app/Workspace.c:303 +msgid "" +"Disable/enable the application Dock (the\n" +"vertical icon bar in the side of the screen)." +msgstr "" +"停用/啟用應用程式停靠區\n" +"(螢幕邊的垂直圖示列)。" + +#: ../../WPrefs.app/Workspace.c:324 +msgid "" +"Disable/enable the Clip (that thing with\n" +"a paper clip icon)." +msgstr "" +"停用/啟用迴紋針 (有迴紋針圖示的那個東西)。" + +#: ../../WPrefs.app/Workspace.c:364 msgid "Workspace Preferences" msgstr "工作區設定" -#: ../../WPrefs.app/main.c:71 +#: ../../WPrefs.app/Workspace.c:366 +msgid "" +"Workspace navigation features.\n" +"You can also enable/disable the Dock and Clip here." +msgstr "" +"工作區導航特色。\n" +"你也可以在此啟用/停用停靠區與迴紋針。" + +#: ../../WPrefs.app/imagebrowser.c:95 +msgid "View" +msgstr "檢視" + +#: ../../WPrefs.app/main.c:59 #, c-format msgid "usage: %s [options]\n" msgstr "使用法: %s [選項]\n" -#: ../../WPrefs.app/main.c:72 +#: ../../WPrefs.app/main.c:60 msgid "options:" msgstr "選項:" -#: ../../WPrefs.app/main.c:73 +#: ../../WPrefs.app/main.c:61 msgid " -display \tdisplay to be used" msgstr " -display \t要使用的 display" -#: ../../WPrefs.app/main.c:74 +#: ../../WPrefs.app/main.c:62 msgid " --version\t\tprint version number and exit" msgstr " --version\t\t印出版本編號並離開" -#: ../../WPrefs.app/main.c:75 +#: ../../WPrefs.app/main.c:63 msgid " --help\t\tprint this message and exit" msgstr " --help\t\t顯示本說明訊息" -#: ../../WPrefs.app/main.c:134 +#: ../../WPrefs.app/main.c:122 #, c-format msgid "too few arguments for %s" msgstr "%s 的參數太少" -#: ../../WPrefs.app/main.c:156 +#: ../../WPrefs.app/main.c:145 msgid "X server does not support locale" msgstr "X 伺服器並不支援當地化 (locale)" -#: ../../WPrefs.app/main.c:159 +#: ../../WPrefs.app/main.c:148 msgid "cannot set locale modifiers" msgstr "無法設定 locale modifiers" -#: ../../WPrefs.app/main.c:165 +#: ../../WPrefs.app/main.c:154 #, c-format msgid "could not open display %s" msgstr "無法開啟 display %s" -#: ../../WPrefs.app/main.c:173 +#: ../../WPrefs.app/main.c:162 msgid "could not initialize application" msgstr "無法啟始應用程式" +msgid "Window Title" +msgstr "視窗標題" + +msgid "Menu Text" +msgstr "選單文字" + +msgid "Icon Title" +msgstr "圖示標題" + +msgid "Clip Title" +msgstr "迴紋針標題" + +msgid "Desktop Caption" +msgstr "桌面標題" + +#~ msgid "Disable cycling color highlighting of icons." +#~ msgstr "使圖示的循環色彩強調失效" + +#~ msgid "" +#~ "Set keyboard input focus to\n" +#~ "the window under the mouse pointer,\n" +#~ "including the root window." +#~ msgstr "" +#~ "設定鍵盤輸入焦點至\n" +#~ "滑鼠指標下面的視窗，\n" +#~ "包含根視窗。" + +#~ msgid "Click window to focus" +#~ msgstr "按視窗取得焦點" + +#~ msgid "Focus follows mouse" +#~ msgstr "焦點跟著滑鼠" + +#~ msgid "\"Sloppy\" focus" +#~ msgstr "\"Sloppy\" 焦點" + +#~ msgid "Icon Display" +#~ msgstr "圖示顯示" + +#~ msgid "New Command %i" +#~ msgstr "新增命令 %i" + +#~ msgid "Workspaces" +#~ msgstr "工作區" + +#~ msgid "Add Command" +#~ msgstr "新增命令" + +#~ msgid "Add Submenu" +#~ msgstr "增加副選單" + +#~ msgid "Add External Menu" +#~ msgstr "增加外部選單" + +#~ msgid "Remove Item" +#~ msgstr "刪除項目" + +#~ msgid "Cut Item" +#~ msgstr "剪下項目" + +#~ msgid "Copy Item" +#~ msgstr "複製項目" + +#~ msgid "Paste Item" +#~ msgstr "貼上項目" + +#~ msgid "Label" +#~ msgstr "標籤" + +#~ msgid "Hide Others" +#~ msgstr "隱藏其他" + +#~ msgid "Legal Panel" +#~ msgstr "法律面板" + +#~ msgid "Menu Path/Directory List" +#~ msgstr "選單路徑/目錄清單" + +#~ msgid "Ask help to the Guru" +#~ msgstr "向專家求助" + +#~ msgid "%s/Library/WindowMaker/plmenu" +#~ msgstr "%s/Library/WindowMaker/plmenu" + +#~ msgid "" +#~ "Could not copy default plmenu file from ~/GNUstep/Library/WindowMaker" +#~ msgstr "在 ~/GNUstep/Library/WindowMaker 底下找不到預設的 plmenu 檔案" + +#~ msgid "" +#~ "The format of the menu in ~/G/D/WMRootMenu is not recognized by WPrefs. " +#~ "It might be in a format different than the one supported by WPrefs or " +#~ "contain a syntax error. Do you want to continue using the current menu to " +#~ "edit it by hand later or replace it with a default menu in the new format?" +#~ msgstr "" +#~ "WPrefs 無法辨認 ~/G/D/WMRootMenu 的選單格式，原有的選單可能是 WPrefs 不支" +#~ "援的格式，也可能是選單定義有語法錯誤；你希望繼續使用目前的選單並且在以後都" +#~ "以手動編輯，還是讓 WPrefs 為你換上一個新的預設選單? " + +#~ msgid "Install default menu" +#~ msgstr "安裝預設選單" + +#~ msgid "Any changes made in this section will not be saved" +#~ msgstr "在這部份的任何改變不會被儲存" + +#~ msgid "Menu Guru - Select Type" +#~ msgstr "選單專家 - 選取型態" + +#~ msgid "Next" +#~ msgstr "下一步" + +#~ msgid "Menu Guru - Select Menu File" +#~ msgstr "選單專家 - 選取選單檔" + +#~ msgid "Menu Guru - Select Pipe Command" +#~ msgstr "選單專家 - 選取 Pipe 命令" + +#~ msgid "Menu Guru - Select Command" +#~ msgstr "選單專家 - 選取命令" + +#~ msgid "Back" +#~ msgstr "上一步" + +#~ msgid "" +#~ "This process will help you create a submenu which definition is located " +#~ "in another file or is created dynamically.\n" +#~ "What do you want to use as the contents of the submenu?" +#~ msgstr "" +#~ "這程序會幫你建立在另一個檔案或動態建立定義的副目錄。\n" +#~ "你要用什麼當作副目錄的內容？" + +#~ msgid "" +#~ "A file containing the menu definition in the plain text (non-property " +#~ "list) menu format." +#~ msgstr "含有純文字（無特質清單）選單格式選單定義的檔案。" + +#~ msgid "" +#~ "The menu definition generated by a script/program read through a pipe." +#~ msgstr "由手稿/程式經過 pipe 讀入產生選單定義" + +#~ msgid "The files in one or more directories." +#~ msgstr "檔案在一個或多個目錄中" + +#~ msgid "Type the path for the menu file:" +#~ msgstr "輸入選單檔路徑：" + +#~ msgid "" +#~ "The menu file must contain a menu in the plain text menu file format. " +#~ "This format is described in the menu files included with WindowMaker, " +#~ "probably at ~/GNUstep/Library/WindowMaker/menu" +#~ msgstr "" +#~ "選單檔必須含有純文字選單檔格式的選單。這格式在 WindowMaker 包含的選單檔中" +#~ "有描述，可能在~/GNUstep/Library/WindowMaker/menu" + +#~ msgid "Type the command that will generate the menu definition:" +#~ msgstr "輸入會產生選單定義的命令：" + +#~ msgid "" +#~ "The command supplied must generate and output a valid menu definition to " +#~ "stdout. This definition should be in the plain text menu file format, " +#~ "described in the menu files included with WindowMaker, usually at ~/" +#~ "GNUstep/Library/WindowMaker/menu" +#~ msgstr "" +#~ "提供的命令必須產生且輸出有效的選單定義至標準輸出。這定義應該是純文字選單檔" +#~ "格﹛A在 WindowMaker 包含的選單檔中有描述，通常在 ~/GNUstep/Library/" +#~ "WindowMaker/menu" + +#~ msgid "" +#~ "Type the path for the directory. You can type more than one path by " +#~ "separating them with spaces." +#~ msgstr "輸入目錄的路徑。你可以利用空白分隔輸入超過一個路徑。" + +#~ msgid "" +#~ "The menu generated will have an item for each file in the directory. The " +#~ "directories can contain program executables or data files (such as jpeg " +#~ "images)." +#~ msgstr "" +#~ "產生的選單會有一個項目給目錄中的每一個檔案。目錄可以含有可執行的程式或資料" +#~ "檔]例如 jpeg 影像）。" + +#~ msgid "" +#~ "If the directory contain data files, type the command used to open these " +#~ "files. Otherwise, leave it in blank." +#~ msgstr "如果目錄含有資料檔，輸入用來開啟這些檔案的命令。否則，留空白。" + +#~ msgid "" +#~ "Each file in the directory will have an item and they will be opened with " +#~ "the supplied command.For example, if the directory contains image files " +#~ "and the command is \"xv -root\", each file in the directory will have a " +#~ "menu item like \"xv -root imagefile\"." +#~ msgstr "" +#~ "目錄中的每一個檔案會有一個項目且會以提供的命令開啟。舉例來說，如果目錄含有" +#~ "影鹿犮B命令是 \"xv -root\"，目錄中的每一個檔案會有一個像 \"xv -root " +#~ "imagefile\" 的項目。" + +#~ msgid "mouse button %s not supported by WPrefs." +#~ msgstr "滑鼠按鈕 %s 未被 WPrefs 支援" + +#~ msgid "Invalid font %s." +#~ msgstr "無效的字型 %s。" + +#~ msgid "Set Font..." +#~ msgstr "設定字型..." + +#~ msgid "Menu Title Font" +#~ msgstr "選單標題字型" + +#~ msgid "Menu Item Font" +#~ msgstr "選單項目字型" + +#~ msgid "Icon Title Font" +#~ msgstr "圖示標題字型" + +#~ msgid "Clip Title Font" +#~ msgstr "迴紋針標題字型" + +#~ msgid "Geometry Display Font" +#~ msgstr "位置表示字型" + +#~ msgid "" +#~ "Sample Text\n" +#~ "abcdefghijklmnopqrstuvxywz\n" +#~ "ABCDEFGHIJKLMNOPQRSTUVXYWZ\n" +#~ "0123456789" +#~ msgstr "" +#~ "範例文字\n" +#~ "abcdefghijklmn...ㄅㄆㄇㄈㄉ\n" +#~ "ABCDEFGHIJKLMN...視窗管理員\n" +#~ "123...一二三" + +#~ msgid "Text Preferences" +#~ msgstr "文字設定" + +#~ msgid "Workspace/Clip" +#~ msgstr "工作區/迴紋真" + +#~ msgid "Icons" +#~ msgstr "圖示" + +#~ msgid "Set..." +#~ msgstr "設定..." + +#~ msgid "Unselected Items" +#~ msgstr "未選取項目" + +#~ msgid "Selected Items" +#~ msgstr "選取項目" + +#~ msgid "Text" +#~ msgstr "文字" + +#~ msgid "Menu Title Background" +#~ msgstr "選單標題背景" + +#~ msgid "Workspace Background" +#~ msgstr "工作區背景" + +#~ msgid "Change" +#~ msgstr "改變" + +#~ msgid "Clip Title Text" +#~ msgstr "迴文針標題文字" + +#~ msgid "Normal" +#~ msgstr "正常" + +#~ msgid "Collapsed" +#~ msgstr "折疊" + +#~ msgid "Texture and Color Preferences" +#~ msgstr "材質與色彩設定" + +#~ msgid "Window Maker Preferences Utility" +#~ msgstr "Window Maker 設定公用程式" + +#~ msgid "Version %s for Window Maker %s" +#~ msgstr "Window Maker %s 用版本 %s" + +#~ msgid "" +#~ "Programming/Design: Alfredo K. Kojima\n" +#~ "Artwork: Marco van Hylckama Vlieg\n" +#~ "More Programming: James Thompson" +#~ msgstr "" +#~ "程式/設計：Alfredo K. Kojima\n" +#~ "美術：Marco van Hylckama Vlieg\n" +#~ "程式：James Thompson" + +#~ msgid "" +#~ "WPrefs is free software and is distributed WITHOUT ANY WARRANTY under the " +#~ "terms of the GNU General Public License. Redistribution of the icons in " +#~ "this program separately from the program is prohibited." +#~ msgstr "" +#~ "WPrefs 是自由軟體且在 GNU General Public License 條款下無任何保証地發送。" +#~ "禁止單獨重新發送這程式中的圖示" + +#~ msgid "" +#~ "Could not extract version from Window Maker. Make sure it is correctly " +#~ "installed." +#~ msgstr "無法得知 Window Maker 的版本。確定它安裝正確。" + +#~ msgid "" +#~ "switch to first workspace when switching past the last workspace and vice-" +#~ "versa" +#~ msgstr "當切換超過最後一個工作區時切換至第一個工作區，反之亦然。" + #~ msgid "" #~ "The format of the current menu in ~/G/D/WMRootMenu is not supported by " #~ "WPrefs. A new menu will be created.\n" -#~ "You can also replace ~/G/D/WMRootMenu with ~/G/L/W/plmenu to get the default " -#~ "menu." +#~ "You can also replace ~/G/D/WMRootMenu with ~/G/L/W/plmenu to get the " +#~ "default menu." #~ msgstr "" #~ "目前在 ~/G/D/WMRootMenu 的選單格式未被 WPrefs 支援。新選單會被建立。\n" -#~ "您也可以用把 ~/G/D/WMRootMenu 換成 ~/G/L/W/plmenu 來得到預設選單。" +#~ "你也可以用把 ~/G/D/WMRootMenu 換成 ~/G/L/W/plmenu 來得到預設選單。" diff -Naur WindowMaker-0.91.0/WPrefs.app/tiff/CVS/Entries wm/WPrefs.app/tiff/CVS/Entries --- WindowMaker-0.91.0/WPrefs.app/tiff/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/tiff/CVS/Entries 2005-05-17 22:43:16 +0400 @@ -0,0 +1,70 @@ +/.cvsignore/1.4/Wed Apr 2 11:37:07 2003// +/Makefile.am/1.10/Mon Nov 1 00:50:19 2004// +/README/1.3/Sun Nov 12 04:03:31 2000// +/advancetonewworkspace.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/animations.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/appearance.tiff/1.3/Wed Mar 1 08:15:56 2000// +/clip.tiff/1.2/Mon Jan 25 19:06:53 1999// +/configs.tiff/1.4/Wed Mar 29 00:00:28 2000// +/cycleworkspaces.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/dock.tiff/1.2/Mon Jan 25 19:06:53 1999// +/dontlinkworkspaces.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/ergonomic.tiff/1.4/Wed Mar 29 01:04:11 2000// +/expert.tiff/1.2/Thu Jan 20 11:50:36 2000// +/fonts.tiff/1.2/Tue Oct 19 03:24:07 2004// +/iconprefs.tiff/1.4/Wed Mar 1 08:15:56 2000// +/keyboard.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/keyboardprefs.tiff/1.2/Mon Jan 25 19:06:53 1999// +/keyshortcuts.tiff/1.3/Thu Jan 20 11:50:36 2000// +/menualign1.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/menualign2.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/menuprefs.tiff/1.4/Wed Mar 1 08:15:56 2000// +/menus.tiff/1.5/Mon Mar 27 01:13:21 2000// +/miscprefs2.tiff/1.1/Mon Jan 25 19:06:53 1999// +/moreanim.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/mousesettings.tiff/1.3/Thu Jan 20 11:50:36 2000// +/mousespeed.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/msty1.tiff/1.2/Tue May 18 20:00:56 1999// +/msty2.tiff/1.2/Tue May 18 20:00:56 1999// +/msty3.tiff/1.2/Tue May 18 20:00:56 1999// +/newstyle.tiff/1.3/Sat May 1 17:44:44 1999// +/nonopaque.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/oldstyle.tiff/1.3/Sat May 1 17:44:44 1999// +/opaque.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/paths.tiff/1.3/Thu Jan 20 11:50:36 2000// +/smooth.tiff/1.1/Sat May 1 17:44:44 1999// +/sound.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/speed0.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/speed0s.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/speed1.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/speed1s.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/speed2.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/speed2s.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/speed3.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/speed3s.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/speed4.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/speed4s.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/tdel.tiff/1.3/Sun May 16 02:49:05 1999// +/tedit.tiff/1.3/Tue May 18 20:00:56 1999// +/temp.tiff/1.1/Mon Jan 25 19:06:53 1999// +/textr.tiff/1.2/Sun May 16 02:49:05 1999// +/theme.tiff/1.1/Mon Jan 25 19:06:54 1999// +/timer0.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/timer0s.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/timer1.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/timer1s.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/timer2.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/timer2s.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/timer3.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/timer3s.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/timer4.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/timer4s.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/timer5.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/timer5s.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +/tnew.tiff/1.3/Tue May 18 20:00:56 1999// +/whandling.tiff/1.4/Wed Mar 1 08:15:56 2000// +/windowfocus.tiff/1.4/Wed Mar 1 08:15:56 2000// +/workspace.tiff/1.4/Wed Mar 1 08:15:56 2000// +/workspacename.tiff/1.1/Sat Oct 23 21:57:53 1999// +/xis.tiff/1.1.1.1/Tue Sep 29 22:36:38 1998// +D diff -Naur WindowMaker-0.91.0/WPrefs.app/tiff/CVS/Repository wm/WPrefs.app/tiff/CVS/Repository --- WindowMaker-0.91.0/WPrefs.app/tiff/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/tiff/CVS/Repository 2005-05-17 22:43:15 +0400 @@ -0,0 +1 @@ +wm/WPrefs.app/tiff diff -Naur WindowMaker-0.91.0/WPrefs.app/tiff/CVS/Root wm/WPrefs.app/tiff/CVS/Root --- WindowMaker-0.91.0/WPrefs.app/tiff/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/tiff/CVS/Root 2005-05-17 22:43:15 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/WPrefs.app/tiff/.cvsignore wm/WPrefs.app/tiff/.cvsignore --- WindowMaker-0.91.0/WPrefs.app/tiff/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/tiff/.cvsignore 2003-04-02 15:37:07 +0400 @@ -0,0 +1,2 @@ +Makefile Makefile.in +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/WPrefs.app/tiff/Makefile.am wm/WPrefs.app/tiff/Makefile.am --- WindowMaker-0.91.0/WPrefs.app/tiff/Makefile.am 2000-04-03 01:05:08 +0400 +++ wm/WPrefs.app/tiff/Makefile.am 2004-11-01 03:50:19 +0300 @@ -1,4 +1,4 @@ -tiffdatadir = $(wprefsdir)/tiff +tiffdatadir = $(wprefs_datadir)/tiff EXTRA_DIST = \ advancetonewworkspace.tiff \ diff -Naur WindowMaker-0.91.0/WPrefs.app/tiff/Makefile.in wm/WPrefs.app/tiff/Makefile.in --- WindowMaker-0.91.0/WPrefs.app/tiff/Makefile.in 2004-10-26 08:10:47 +0400 +++ wm/WPrefs.app/tiff/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,252 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = ../.. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -tiffdatadir = $(wprefsdir)/tiff - -EXTRA_DIST = advancetonewworkspace.tiff animations.tiff appearance.tiff clip.tiff configs.tiff cycleworkspaces.tiff dock.tiff dontlinkworkspaces.tiff ergonomic.tiff expert.tiff fonts.tiff iconprefs.tiff keyboard.tiff keyboardprefs.tiff keyshortcuts.tiff menualign1.tiff menualign2.tiff menuprefs.tiff menus.tiff moreanim.tiff mousesettings.tiff mousespeed.tiff msty1.tiff msty2.tiff msty3.tiff newstyle.tiff nonopaque.tiff oldstyle.tiff opaque.tiff paths.tiff smooth.tiff sound.tiff speed0.tiff speed0s.tiff speed1.tiff speed1s.tiff speed2.tiff speed2s.tiff speed3.tiff speed3s.tiff speed4.tiff speed4s.tiff tdel.tiff tedit.tiff textr.tiff theme.tiff timer0.tiff timer0s.tiff timer1.tiff timer1s.tiff timer2.tiff timer2s.tiff timer3.tiff timer3s.tiff timer4.tiff timer4s.tiff timer5.tiff timer5s.tiff tnew.tiff whandling.tiff windowfocus.tiff workspace.tiff workspacename.tiff xis.tiff - - -TIFF_FILES = - -tiffdata_DATA = $(TIFF_FILES) -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../src/config.h -CONFIG_CLEAN_FILES = -DATA = $(tiffdata_DATA) - -DIST_COMMON = README Makefile.am Makefile.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -all: all-redirect -.SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps WPrefs.app/tiff/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -install-tiffdataDATA: $(tiffdata_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(tiffdatadir) - @list='$(tiffdata_DATA)'; for p in $$list; do \ - if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(tiffdatadir)/$$p"; \ - $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(tiffdatadir)/$$p; \ - else if test -f $$p; then \ - echo " $(INSTALL_DATA) $$p $(DESTDIR)$(tiffdatadir)/$$p"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(tiffdatadir)/$$p; \ - fi; fi; \ - done - -uninstall-tiffdataDATA: - @$(NORMAL_UNINSTALL) - list='$(tiffdata_DATA)'; for p in $$list; do \ - rm -f $(DESTDIR)$(tiffdatadir)/$$p; \ - done -tags: TAGS -TAGS: - - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = WPrefs.app/tiff - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-tiffdataDATA install-data-local -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-tiffdataDATA -uninstall: uninstall-am -all-am: Makefile $(DATA) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(tiffdatadir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: uninstall-tiffdataDATA install-tiffdataDATA tags distdir info-am \ -info dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-am install-exec install-data-local install-data-am \ -install-data install-am install uninstall-am uninstall all-redirect \ -all-am all installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean - - -install-data-local: - if [ @ICONEXT@ = "tiff" -a x"$(TIFF_FILES)" = "x" ] ; then\ - $(MAKE) install-data TIFF_FILES="$(EXTRA_DIST)";\ - fi - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WPrefs.app/tiff/miscprefs2.tiff wm/WPrefs.app/tiff/miscprefs2.tiff --- WindowMaker-0.91.0/WPrefs.app/tiff/miscprefs2.tiff 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/tiff/miscprefs2.tiff 1999-01-25 22:06:53 +0300 @@ -0,0 +1,20 @@ +II*$\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN\\\NNffNNNNNNNNNNNNNNNNNNNNNNNN\\\NfNNfNNfNNfNNNNNNNNNNNNNNNNNNNNNNN\\\NfNNfNNfNNfNNNNNNNNNNNNNNNNNNNNNNN\\\NffNffNffNffNNNNNNNNNNNNNNNNNNNNNN\\\NfNNfNNNfNNfNNNNNNNNNNNNNNNNNNNNNN\\\NfNNfNNNfNNfNNNNNNNNNNNNNNNNNNNNNN\\\NNffNffNNNNNNNNNNNNNNNNNNNNNNN\\\NNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNNTT_T2&.qǤ[$=$s$$Duلq_v +b B)i9TT_T2&.qǤ[$=$s$$Duلq_v +b B)i9TT_T2&.qǤ[$=$s$$Duلq_v +b B)i9TT_T2&.qǤ[$=$s$$Duلq_v +b B)i9TT_T2&.qǤ[$=$s$$Duلq_v +b B)i98:>==#W__77}#>pp8ZgG5e~NVFf CoO) ﯯ2bIi1aN&ze% 奥奥奥奥奥奥奥奥奥奥奥奥奥奥奥奥!AUOO^.bIyA>N^1Ncy9Uqqqqqqqqqq qqqqqqqqqq<<aAbBuv&:&&ffFRBkK*nnnnnnnnnn + + + +xnnnnnnnnnnw zꚪjjZZ::zz&zLJw xxxxxtt_VZV2rrRr +J +r +r +*jJj:B=b.Ύ g'ζV""bbbRR22r2r2r +J*rN%E  G]l 4|||<|B¢BB""B""RrRKGG{ߕl<\\<<<||<<<\|"""'{[ߥ9,t, lL\<<<<<\\lܜ<< MG 4d ,LlL\lLlL,lL,\lܜ3=G֦& s} Lt, lL, lL,, lL,\lan#9^in#>800$ + )$$ +%*%R/usr/home/fatal/newprefs/miscprefs2.tiffCreated with The GIMP \ diff -Naur WindowMaker-0.91.0/WPrefs.app/tiff/temp.tiff wm/WPrefs.app/tiff/temp.tiff --- WindowMaker-0.91.0/WPrefs.app/tiff/temp.tiff 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/tiff/temp.tiff 1999-01-25 22:06:53 +0300 @@ -0,0 +1,19 @@ +II*$ *((|HH `ͨʔ@ZZ`eIrr5$$((̀@`U;vvVVNꔔva,`au::},,Z44Phh`PPrr]RRN,,rr¸88_HHHK@e1DD=^^ll,,F88xx$hh_000pLfU00YάZxxb$hh_g - `㔔s+))^ʴbxxZߐ~`yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy.`}ͼ~22r|||000ߐyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy((BBllRR"⼼BBB(((000PPP'%Jyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy2hh ||JLL<<lllppp_ppp;Ayyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy}}^^=n22ȟ(((sHyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyAA00y.bb2bxxBBB888XXXPPPPyyILLnllllbxx$XXXhhhhhh444įPPPP[[[RRbb"8 + + + + +CCC/xxxPPPPyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy|XX"<<<< /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am - -install-data-am: install-xpmdataDATA install-data-local -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-xpmdataDATA -uninstall: uninstall-am -all-am: Makefile $(DATA) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(xpmdatadir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-generic mostlyclean-am - -clean: clean-am - -distclean-am: distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: uninstall-xpmdataDATA install-xpmdataDATA tags distdir info-am \ -info dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-am install-exec install-data-local install-data-am \ -install-data install-am install uninstall-am uninstall all-redirect \ -all-am all installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean - - -install-data-local: - if [ @ICONEXT@ = "xpm" -a x"$(XPM_FILES)" = "x" ] ; then\ - $(MAKE) install-data XPM_FILES="$(EXTRA_DIST)";\ - fi - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/WPrefs.app/xpm/temp.xpm wm/WPrefs.app/xpm/temp.xpm --- WindowMaker-0.91.0/WPrefs.app/xpm/temp.xpm 1970-01-01 03:00:00 +0300 +++ wm/WPrefs.app/xpm/temp.xpm 1999-05-16 06:49:06 +0400 @@ -0,0 +1,159 @@ +/* XPM */ +static char * image_name[] = { +"48 48 108 2", +" c None", +". c #108408420842", +"X c #000000000000", +"o c #084200000000", +"O c #529408420842", +"+ c #739C10841084", +"@ c #421010841084", +"# c #631863186318", +"$ c #739C08420842", +"% c #B5AC18C618C6", +"& c #A52821082108", +"* c #6B5A18C618C6", +"= c #5294294A294A", +"- c #18C618C618C6", +"; c #294A294A294A", +": c #63185AD65AD6", +"> c #842008420842", +", c #A52808420842", +"< c #842010841084", +"1 c #94A44A524A52", +"2 c #AD6A318C318C", +"3 c #5AD621082108", +"4 c #4A5210841084", +"5 c #084208420842", +"6 c #AD6A08420842", +"7 c #DEF66B5A6B5A", +"8 c #AD6A6B5A6B5A", +"9 c #BDEE42104210", +"0 c #739C318C318C", +"q c #5AD6294A294A", +"w c #842018C618C6", +"e c #AD6A5AD65AD6", +"r c #7BDE318C318C", +"t c #421021082108", +"y c #4A5221082108", +"u c #210818C618C6", +"i c #B5AC08420842", +"p c #A528318C318C", +"a c #BDEE4A524A52", +"s c #84204A524A52", +"d c #108410841084", +"f c #631808420842", +"g c #8C6221082108", +"h c #BDEE7BDE7BDE", +"j c #AD6A39CE39CE", +"k c #6318318C318C", +"l c #318C294A294A", +"z c #94A421082108", +"x c #9CE652945294", +"c c #BDEE39CE39CE", +"v c #5AD6318C318C", +"b c #DEF6DEF6DEF6", +"n c #C630294A294A", +"m c #CE7263186318", +"M c #D6B494A494A4", +"N c #7BDE39CE39CE", +"B c #7BDE52945294", +"V c #5294318C318C", +"C c #5AD64A524A52", +"Z c #5AD65AD65AD6", +"A c #529452945294", +"S c #9CE69CE69CE6", +"D c #BDEE21082108", +"F c #BDEE52945294", +"G c #BDEE84208420", +"H c #B5AC39CE39CE", +"J c #7BDE4A524A52", +"K c #4A5242104210", +"L c #421042104210", +"P c #BDEE18C618C6", +"I c #B5AC42104210", +"U c #4A52294A294A", +"Y c #4A5239CE39CE", +"T c #39CE39CE39CE", +"R c #4A5208420842", +"E c #BDEE5AD65AD6", +"W c #CE72739C739C", +"Q c #739C52945294", +"! c #9CE694A494A4", +"~ c #7BDE08420842", +"^ c #739C39CE39CE", +"/ c #4A524A524A52", +"( c #A52884208420", +") c #9CE64A524A52", +"_ c #C63084208420", +"` c #739C4A524A52", +"' c #210821082108", +"] c #A5289CE69CE6", +"[ c #94A4318C318C", +"{ c #631839CE39CE", +"} c #318C318C318C", +"| c #CE72CE72CE72", +" . c #63184A524A52", +".. c #6B5A4A524A52", +"X. c #5AD652945294", +"o. c #6B5A6B5A6B5A", +"O. c #C630C630C630", +"+. c #529439CE39CE", +"@. c #421018C618C6", +"#. c #8C628C628C62", +"$. c #7BDE7BDE7BDE", +"%. c #A528A528A528", +"&. c #842084208420", +"*. c #94A494A494A4", +"=. c #739C739C739C", +"-. c #D6B4D6B4D6B4", +";. c #B5ACB5ACB5AC", +":. c #AD6AAD6AAD6A", +" ", +" ", +" ", +" . X ", +" o O + @ ", +" # # # # # # # # # # # # # # # # # # # # # # # # # # # # $ % & * = X X X ", +" # - - - - - - - - - - - - - - - - - - - - - - - - ; : > , < 1 2 3 4 5 X X ", +" # - - - - - - - - - - - - - - - - - - - - - - - - ; $ 6 7 8 9 0 q * - 5 X ", +" # - - - - - - - - - - - - - - - - - - - - - - - - $ % w e 9 r q t y - 5 X ", +" # - - - - - - - - - - - - - - - - - - - - - - u $ i p 1 a 0 s t t u d 5 X X ", +" # - - - - - - - - - - - - - - - - - - - - - - f , g h j 0 k t y u d d 5 X X X ", +" # ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; l f 6 z x c 0 v t t u d d 5 5 X X X ", +" b b b b b b b b b b b b b b b b b b b b b $ n m M 9 N B V t C Z A d 5 X X X X ", +" b S S S S S S S S S S S S S S S S S S S $ D F G H N J = y K L L - d 5 5 X X X ", +" b S S S S S S S S S S S S S S S S S S O P a h I 0 J U t Y L L T - 5 5 5 X X X ", +" b S S S S S S S S S S S S S S S S S R P E W I N Q V y Y L L T T - d d 5 X X ", +" b S S S S S S S S S S S S S S S ! ~ P E h 9 ^ J V t Y / Y T T T - d - 5 X X ", +" b S S S S S S S S S S S S S S S ( $ ) _ I ^ ` U t Y L L T T T L ' ' - 5 X ", +" b L L L L L L L L L L L L L L L L ] y [ 0 { y y u - - - - - - ' } ' ' 5 X ", +" b b b b b b b b b b b b b b b b | b .t ..= t X.A A A / / A o.S O.; ' 5 X ", +" b S S S S S S S S S S S S S S | S Z A +.@.@.Y L T T T L L / o.#.L ; ' 5 X ", +" b S S S S S S S S S S S S S | S Z / } $.X.L L L T T T L A o.#.S L ; ' 5 X ", +" b S S S S S S S S S S S %.| S A / T &.$./ T T T T T L / o.#.S S L ; ' 5 X ", +" b S S S S S S S S S S S | &.Z / T #.#.o./ T T T T L A o.#.S S S L ; ' 5 X ", +" b S S S S S S S S S %.| $.Z T L S *.$.A L T T T L A =.#.S S S S L ; ' 5 X ", +" b L L L L L L L L L | =.A } } L T } ' - - - ' ' ' } T L L L L L L ; ' 5 X ", +" b b b b b b b b b O.&.# T # -.O.%.$.Z A Z =.*.%.;.O.-.b b b b b b ; ' 5 X ", +" b S S S S S S S | =./ } # S *.=.Z L T L A =.#.*.S S S S S S S S L ; ' 5 X ", +" b S S S S S S O.$.A T o.S *.=.A L T L A =.#.S S S S S S S S S S L ; ' 5 X ", +" b S S S S %.| =./ } $.S *.=.A L T L Z $.*.S S S S S S S S S S S L ; ' 5 X ", +" b S S S S | o./ } #.S *.=.A L T L Z $.*.S S S S S S S S S S S S L ; ' 5 X ", +" b S S %.| =.L } &.S *.=.A L T / # $.*.S S S S S S S S S S S S S L ; ' 5 X ", +" b Z T / &.T } L L T } ' - - ' ; T T L L L L L L L L L L L L L L L ; ' 5 X ", +" -.| O.; L / O.b O.%.=.A A o.#.;.| b b b b b b b b b b b b b b b b ; ' 5 X ", +" | O.O.o.L &.S #.=.A L T / o.&.S S S S S S S S S S S S S S S S S L ; ' 5 X ", +" } O.| :.Z } o.S *.=.A L T / =.#.S S S S S S S S S S S S S S S S S S L ; ' 5 X ", +" %.%.O.#.} $.*.&.=.A L L A =.#.S S S S S S S S S S S S S S S S S S S L ; ' 5 X ", +" ;.;./ #.#.$.# / L L A =.#.S S S S S S S S S S S S S S S S S S S S L ; ' 5 X ", +" d =.S #.=.# A / L A =.*.S S S S S S S S S S S S S S S S S S S S S L ; ' 5 X ", +" 5 -.T } ; ' ' ' ; } T L L L L L L L L L L L L L L L L L L L L L L L ; ' 5 X ", +" X X 5 d d d - - ' ' ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ; ' 5 X ", +" X X 5 5 5 d d - - ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' ' - 5 X ", +" X X X 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 5 X X ", +" X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X X ", +" X X X X X ", +" X X X X ", +" ", +" "}; diff -Naur WindowMaker-0.91.0/wrlib/ballot_box.xpm wm/wrlib/ballot_box.xpm --- WindowMaker-0.91.0/wrlib/ballot_box.xpm 1998-09-30 02:36:30 +0400 +++ wm/wrlib/ballot_box.xpm 1970-01-01 03:00:00 +0300 @@ -1,906 +0,0 @@ -/* XPM */ -static char * ballot_box_xpm[] = { -"48 48 855 2", -" c None", -". c #B8B8B8", -"+ c #A0A0A0", -"@ c #4A2511", -"# c #A7A7A7", -"$ c #EDEDED", -"% c #EBE8E7", -"& c #A6948D", -"* c #904B22", -"= c #B4622D", -"- c #9F5427", -"; c #87431F", -"> c #4B2410", -", c #BFBFBF", -"' c #464646", -") c #818181", -"! c #D4D4D4", -"~ c #FEFEFE", -"{ c #E79860", -"] c #E38848", -"^ c #F4E2D5", -"/ c #F0E7E2", -"( c #C1804A", -"_ c #9B562B", -": c #7D3E1C", -"< c #8A8A8A", -"[ c #ECDEDF", -"} c #B68183", -"| c #E2E2E2", -"1 c #6A6A6A", -"2 c #686868", -"3 c #C6C6C6", -"4 c #F7F7F7", -"5 c #F5D6C1", -"6 c #E7C9B3", -"7 c #D1D1D1", -"8 c #FBFBFB", -"9 c #E7A966", -"0 c #E7AC69", -"a c #D79A5D", -"b c #B77642", -"c c #9B562C", -"d c #743819", -"e c #3E1C0C", -"f c #717171", -"g c #B4B4B4", -"h c #C1A7A8", -"i c #B37F80", -"j c #BC8E90", -"k c #797979", -"l c #343434", -"m c #E0E0E0", -"n c #DABFC0", -"o c #924345", -"p c #E3CFCF", -"q c #A46264", -"r c #D1B0B1", -"s c #91857C", -"t c #ABABAB", -"u c #EADBCA", -"v c #C98D54", -"w c #E7AA67", -"x c #E8AC69", -"y c #E8AD6B", -"z c #EAAF6C", -"A c #D99E61", -"B c #AD6E3E", -"C c #884723", -"D c #663015", -"E c #503C33", -"F c #565656", -"G c #7E7878", -"H c #978383", -"I c #E8E8E8", -"J c #DBDBDB", -"K c #5F5F5F", -"L c #444444", -"M c #343130", -"N c #EEEEEE", -"O c #BF9192", -"P c #C8A0A1", -"Q c #9B5254", -"R c #DDDDDD", -"S c #BDBDBD", -"T c #646464", -"U c #CEC3BA", -"V c #8D5730", -"W c #E6A865", -"X c #E2A466", -"Y c #EAB270", -"Z c #ECB472", -"` c #BC8450", -" . c #9A5C32", -".. c #763E20", -"+. c #4F3120", -"@. c #3A312C", -"#. c #5D5D5D", -"$. c #999999", -"%. c #2C2C2C", -"&. c #834D28", -"*. c #3D3834", -"=. c #C0C0C0", -"-. c #E1E1E1", -";. c #414141", -">. c #BBBBBB", -",. c #3B1407", -"'. c #2F2113", -"). c #764A2A", -"!. c #DFA061", -"~. c #E8AC6A", -"{. c #E9AE6B", -"]. c #EAB06D", -"^. c #EBB270", -"/. c #EDB673", -"(. c #D9A368", -"_. c #B17848", -":. c #8A4B27", -"<. c #470C06", -"[. c #4B220E", -"}. c #9D562A", -"|. c #CB7F43", -"1. c #D98D4C", -"2. c #AF7B4F", -"3. c #4F4F4F", -"4. c #D3C0C0", -"5. c #AB7D7E", -"6. c #C7C7C7", -"7. c #989898", -"8. c #535353", -"9. c #201714", -"0. c #8E8E8E", -"a. c #413531", -"b. c #B07042", -"c. c #E7AB68", -"d. c #EAB77D", -"e. c #ECB87E", -"f. c #EAB06E", -"g. c #EDB674", -"h. c #EEB877", -"i. c #F2C17E", -"j. c #D0B17B", -"k. c #693E29", -"l. c #34160A", -"m. c #854520", -"n. c #BB6F38", -"o. c #DC965F", -"p. c #E4AE81", -"q. c #F4E1D1", -"r. c #C4C4C4", -"s. c #333333", -"t. c #929292", -"u. c #DACDCD", -"v. c #A47071", -"w. c #7A7A7A", -"x. c #212121", -"y. c #252525", -"z. c #626262", -"A. c #CFD8D4", -"B. c #F4DABD", -"C. c #E9AF6C", -"D. c #EAB16F", -"E. c #EBB371", -"F. c #EDB875", -"G. c #F8D693", -"H. c #FCDD9A", -"I. c #E19151", -"J. c #3A1407", -"K. c #6B3316", -"L. c #B16532", -"M. c #D07F41", -"N. c #DC9A67", -"O. c #AEAEAE", -"P. c #9E9E9E", -"Q. c #9C9C9C", -"R. c #2F2F2F", -"S. c #8F8F8F", -"T. c #B0B0B0", -"U. c #9A9A9A", -"V. c #6D6D6D", -"W. c #363636", -"X. c #0F0F0F", -"Y. c #2D2D2D", -"Z. c #757575", -"`. c #A9ACAA", -" + c #91A59C", -".+ c #C0CBC6", -"++ c #637F72", -"@+ c #F0CAA1", -"#+ c #EEBB78", -"$+ c #FADA98", -"%+ c #F8D18E", -"&+ c #E58D48", -"*+ c #CB6830", -"=+ c #502510", -"-+ c #9B5328", -";+ c #C9773B", -">+ c #D27F40", -",+ c #D38141", -"'+ c #D48344", -")+ c #BF8253", -"!+ c #85532C", -"~+ c #361A0C", -"{+ c #686260", -"]+ c #CFCFCF", -"^+ c #5A5A5A", -"/+ c #1A1A1A", -"(+ c #5E5E5E", -"_+ c #5C5C5C", -":+ c #3A3A3A", -"<+ c #0D0D0D", -"[+ c #3E3E3E", -"}+ c #828282", -"|+ c #C4C7C6", -"1+ c #DFE4E2", -"2+ c #15402C", -"3+ c #A1B2AA", -"4+ c #F6E2CD", -"5+ c #EBB882", -"6+ c #EFBE7C", -"7+ c #FCE09D", -"8+ c #F2BC79", -"9+ c #D77334", -"0+ c #DF7D3A", -"a+ c #E07E3B", -"b+ c #8B4821", -"c+ c #BF6C34", -"d+ c #CE7A3D", -"e+ c #D07C3E", -"f+ c #D17E3F", -"g+ c #CA7A3E", -"h+ c #864722", -"i+ c #511F0C", -"j+ c #491909", -"k+ c #4B2211", -"l+ c #6C6360", -"m+ c #323232", -"n+ c #131313", -"o+ c #191919", -"p+ c #393939", -"q+ c #C9C9C9", -"r+ c #728C80", -"s+ c #967568", -"t+ c #66331A", -"u+ c #E6A965", -"v+ c #F4CB88", -"w+ c #FEE4A1", -"x+ c #E89F5D", -"y+ c #DC7736", -"z+ c #DD7937", -"A+ c #DE7A37", -"B+ c #D77536", -"C+ c #AF5F2C", -"D+ c #E2813C", -"E+ c #D77C3B", -"F+ c #CD783C", -"G+ c #CF7A3D", -"H+ c #CA793D", -"I+ c #B06733", -"J+ c #B26835", -"K+ c #815636", -"L+ c #1D1715", -"M+ c #1B0D08", -"N+ c #706F6F", -"O+ c #939393", -"P+ c #050505", -"Q+ c #040404", -"R+ c #000000", -"S+ c #0D0401", -"T+ c #1F0A03", -"U+ c #444140", -"V+ c #F7E6D6", -"W+ c #7A492D", -"X+ c #A96F3F", -"Y+ c #E6A966", -"Z+ c #F8D491", -"`+ c #F9D593", -" @ c #DF8748", -".@ c #DA7434", -"+@ c #DB7635", -"@@ c #DB7736", -"#@ c #D47234", -"$@ c #793E24", -"%@ c #361F1A", -"&@ c #4D1C0A", -"*@ c #783919", -"=@ c #D87A38", -"-@ c #D77B3B", -";@ c #CD773B", -">@ c #D07D3E", -",@ c #D27E40", -"'@ c #D38041", -")@ c #D48243", -"!@ c #D7894A", -"~@ c #B28E5F", -"{@ c #2A261D", -"]@ c #030100", -"^@ c #222121", -"/@ c #171717", -"(@ c #1B0F0B", -"_@ c #441708", -":@ c #57240E", -"<@ c #4D4743", -"[@ c #FCF7F3", -"}@ c #E5AA70", -"|@ c #E2A05E", -"1@ c #E8AE6B", -"2@ c #FADC99", -"3@ c #F3C685", -"4@ c #D87638", -"5@ c #D77132", -"6@ c #D87233", -"7@ c #D97334", -"8@ c #BF642D", -"9@ c #4F1F0D", -"0@ c #3A3432", -"a@ c #555555", -"b@ c #C1C1C1", -"c@ c #120000", -"d@ c #411608", -"e@ c #4D1B09", -"f@ c #5C260F", -"g@ c #A85A28", -"h@ c #D77A3A", -"i@ c #CC763A", -"j@ c #CE793C", -"k@ c #CF7B3D", -"l@ c #D07D3F", -"m@ c #D78849", -"n@ c #FBDD9B", -"o@ c #5F553C", -"p@ c #1F1F1F", -"q@ c #7D5737", -"r@ c #D79154", -"s@ c #DD9352", -"t@ c #804724", -"u@ c #733F21", -"v@ c #E3A66E", -"w@ c #E19C5B", -"x@ c #ECB876", -"y@ c #EBAE6F", -"z@ c #D46B30", -"A@ c #D56C30", -"B@ c #D66E31", -"C@ c #D77032", -"D@ c #994B20", -"E@ c #46190A", -"F@ c #312825", -"G@ c #6C6C6C", -"H@ c #D2D2D2", -"I@ c #B68F90", -"J@ c #D7BDBE", -"K@ c #060200", -"L@ c #331106", -"M@ c #8B3712", -"N@ c #68270D", -"O@ c #59240E", -"P@ c #A35829", -"Q@ c #CF7B3E", -"R@ c #D17D3F", -"S@ c #F1C584", -"T@ c #7F7250", -"U@ c #0D0804", -"V@ c #5E3C20", -"W@ c #B57642", -"X@ c #DA8E4D", -"Y@ c #DB8F4F", -"Z@ c #DC9150", -"`@ c #804725", -" # c #D58F51", -".# c #E19D5C", -"+# c #F2C886", -"@# c #FBDC99", -"## c #DD8D51", -"$# c #D1682E", -"%# c #D2692E", -"&# c #D36B2F", -"*# c #CC672E", -"=# c #7D3918", -"-# c #4D1A09", -";# c #290E05", -"># c #321A11", -",# c #3B3B3B", -"'# c #3D3D3D", -")# c #1E0A03", -"!# c #903A13", -"~# c #873511", -"{# c #63250C", -"]# c #693015", -"^# c #AC5F2E", -"/# c #CD783B", -"(# c #D38142", -"_# c #DD9656", -":# c #D68647", -"<# c #D88848", -"[# c #D88A49", -"}# c #D98C4C", -"|# c #DC9151", -"1# c #DD9453", -"2# c #E29F5E", -"3# c #F8D592", -"4# c #F4CB8A", -"5# c #D67B41", -"6# c #CD642C", -"7# c #CF662D", -"8# c #D0672E", -"9# c #C15F2A", -"0# c #632810", -"a# c #7D3817", -"b# c #C4642C", -"c# c #873F1A", -"d# c #7C2B0F", -"e# c #8D401A", -"f# c #290801", -"g# c #803310", -"h# c #823311", -"i# c #5A210B", -"j# c #6A3015", -"k# c #BC6C35", -"l# c #D37F40", -"m# c #D58344", -"n# c #D58445", -"o# c #D88948", -"p# c #D88B4A", -"q# c #DA8F4E", -"r# c #DB904F", -"s# c #E4A665", -"t# c #FCDF9C", -"u# c #EAB274", -"v# c #CD6831", -"w# c #CB612A", -"x# c #CC632B", -"y# c #AD5324", -"z# c #511D0B", -"A# c #763013", -"B# c #CB642C", -"C# c #C9612B", -"D# c #AC4A1E", -"E# c #9D4F22", -"F# c #1B0500", -"G# c #180902", -"H# c #50200A", -"I# c #7E3110", -"J# c #7B3D1C", -"K# c #BE6E36", -"L# c #D58546", -"M# c #D78748", -"N# c #D88949", -"O# c #D98B4A", -"P# c #ECB977", -"Q# c #DE975C", -"R# c #C75D27", -"S# c #C85F28", -"T# c #CA6029", -"U# c #93421C", -"V# c #622911", -"W# c #943412", -"X# c #BE5825", -"Y# c #D56E31", -"Z# c #A55525", -"`# c #310802", -" $ c #240601", -".$ c #150500", -"+$ c #200C03", -"@$ c #702D0E", -"#$ c #752D0F", -"$$ c #511D0A", -"%$ c #82401D", -"&$ c #C8773B", -"*$ c #D68546", -"=$ c #FADB99", -"-$ c #D27C44", -";$ c #C55B25", -">$ c #C65C26", -",$ c #C05B26", -"'$ c #793315", -")$ c #060606", -"!$ c #2E2E2E", -"~$ c #EEE1DB", -"{$ c #F8EBE4", -"]$ c #D5723B", -"^$ c #A45425", -"/$ c #260D04", -"($ c #2C0F05", -"_$ c #0C0501", -":$ c #070402", -"<$ c #3C1807", -"[$ c #883611", -"}$ c #8D4B24", -"|$ c #CA783C", -"1$ c #D58444", -"2$ c #DD9757", -"3$ c #F6D290", -"4$ c #F2C989", -"5$ c #C55F2B", -"6$ c #C25824", -"7$ c #C35925", -"8$ c #AF4F21", -"9$ c #60250E", -"0$ c #1C0A04", -"a$ c #0A0A0A", -"b$ c #87595A", -"c$ c #F2D8C9", -"d$ c #D0672D", -"e$ c #A35224", -"f$ c #0D0200", -"g$ c #0F0501", -"h$ c #282828", -"i$ c #070707", -"j$ c #0D0501", -"k$ c #56220B", -"l$ c #6C290E", -"m$ c #9B5126", -"n$ c #E4A766", -"o$ c #FBDE9B", -"p$ c #E5AD71", -"q$ c #BE5322", -"r$ c #BF5523", -"s$ c #C15623", -"t$ c #9D451C", -"u$ c #4C1B0A", -"v$ c #100704", -"w$ c #3F2C2C", -"x$ c #AB9898", -"y$ c #EAE3E3", -"z$ c #F7EAE3", -"A$ c #CE662D", -"B$ c #A25123", -"C$ c #878787", -"D$ c #7F7F7F", -"E$ c #DFDFDF", -"F$ c #425F51", -"G$ c #3E4F47", -"H$ c #121212", -"I$ c #1F0C03", -"J$ c #58210D", -"K$ c #DEB67D", -"L$ c #D38750", -"M$ c #BB5020", -"N$ c #BC5221", -"O$ c #853816", -"P$ c #3F1507", -"Q$ c #0A0402", -"R$ c #0E0E0E", -"S$ c #616161", -"T$ c #B69C9D", -"U$ c #893336", -"V$ c #DB926C", -"W$ c #7C3617", -"X$ c #EAEDEB", -"Y$ c #ACB7B2", -"Z$ c #8E9994", -"`$ c #424E48", -" % c #595959", -".% c #130602", -"+% c #100601", -"@% c #401907", -"#% c #9F411D", -"$% c #B84D1E", -"%% c #B94F1F", -"&% c #B54E20", -"*% c #6D2B10", -"=% c #160702", -"-% c #554338", -";% c #787878", -">% c #382B24", -",% c #97481F", -"'% c #C55F29", -")% c #723114", -"!% c #230B02", -"~% c #302A28", -"{% c #C2C0BE", -"]% c #EEF1F0", -"^% c #A1AFA8", -"/% c #C4CAC7", -"(% c #585858", -"_% c #280D05", -":% c #361207", -"<% c #401708", -"[% c #280F04", -"}% c #551F09", -"|% c #9A3E18", -"1% c #B74C1D", -"2% c #A4451B", -"3% c #5E230D", -"4% c #742E12", -"5% c #963714", -"6% c #883111", -"7% c #77290E", -"8% c #983814", -"9% c #9A3814", -"0% c #91421B", -"a% c #C96029", -"b% c #C25C28", -"c% c #5E250E", -"d% c #1F0A02", -"e% c #0A0200", -"f% c #311205", -"g% c #B8A8A2", -"h% c #82998E", -"i% c #CECECE", -"j% c #140602", -"k% c #3F1608", -"l% c #712B0F", -"m% c #833311", -"n% c #57210B", -"o% c #170802", -"p% c #250C03", -"q% c #6B250C", -"r% c #993D17", -"s% c #B54A1D", -"t% c #A2421A", -"u% c #873615", -"v% c #9D411A", -"w% c #B95020", -"x% c #BB5121", -"y% c #A9441A", -"z% c #9C3A15", -"A% c #C05723", -"B% c #C45B25", -"C% c #C75C27", -"D% c #B05122", -"E% c #55200C", -"F% c #160701", -"G% c #9E8075", -"H% c #BEBEBE", -"I% c #371307", -"J% c #6A280D", -"K% c #813211", -"L% c #803111", -"M% c #7F3111", -"N% c #7E3011", -"O% c #762D0F", -"P% c #451A08", -"Q% c #360B03", -"R% c #7C240B", -"S% c #481808", -"T% c #983C17", -"U% c #782E11", -"V% c #B74D1E", -"W% c #BD5322", -"X% c #B44C1E", -"Y% c #B84F20", -"Z% c #C35924", -"`% c #C45A25", -" & c #AE4F20", -".& c #461909", -"+& c #130600", -"@& c #2D1105", -"#& c #66260D", -"$& c #703D2A", -"%& c #8F7165", -"&& c #6E341C", -"*& c #7D3010", -"=& c #7C3010", -"-& c #7B2F10", -";& c #7A2F10", -">& c #792E10", -",& c #782E10", -"'& c #6A280E", -")& c #2F1205", -"!& c #331206", -"~& c #541E0B", -"{& c #843313", -"]& c #AE451A", -"^& c #B1471B", -"/& c #BF5422", -"(& c #9C451C", -"_& c #867872", -":& c #A68574", -"<& c #3F1B0F", -"[& c #0C0300", -"}& c #2C1005", -"|& c #501D0A", -"1& c #772D10", -"2& c #752C0F", -"3& c #742C0F", -"4& c #6F2A0E", -"5& c #722B0F", -"6& c #511E0A", -"7& c #6E270E", -"8& c #A93F18", -"9& c #B0461B", -"0& c #B4491C", -"a& c #B54A1C", -"b& c #BC5121", -"c& c #9A431B", -"d& c #3B3431", -"e& c #E9E9E9", -"f& c #838181", -"g& c #260400", -"h& c #6B280E", -"i& c #732B0F", -"j& c #712A0F", -"k& c #702A0F", -"l& c #6F2A0F", -"m& c #6E290E", -"n& c #5C220C", -"o& c #3D1407", -"p& c #832F11", -"q& c #AD4419", -"r& c #AF451A", -"s& c #B2481B", -"t& c #B84E1F", -"u& c #8C3C18", -"v& c #CACACA", -"w& c #454545", -"x& c #371506", -"y& c #702A0E", -"z& c #6D290E", -"A& c #6C280E", -"B& c #6A270E", -"C& c #69270E", -"D& c #3E1507", -"E& c #8B3413", -"F& c #AE431A", -"G& c #B1461B", -"H& c #B5491C", -"I& c #893816", -"J& c #452B1F", -"K& c #A3A3A3", -"L& c #DEDEE1", -"M& c #E6E6E6", -"N& c #0F0000", -"O& c #090300", -"P& c #160801", -"Q& c #531F0A", -"R& c #461A09", -"S& c #545454", -"T& c #724C3D", -"U& c #68260E", -"V& c #67260D", -"W& c #66250D", -"X& c #65250D", -"Y& c #3D1507", -"Z& c #863213", -"`& c #AC4119", -" * c #B0461A", -".* c #863514", -"+* c #53382D", -"@* c #959595", -"#* c #C6C6C9", -"$* c #4D4F60", -"%* c #7F808D", -"&* c #404154", -"** c #CECED3", -"=* c #BEBFC5", -"-* c #040100", -";* c #0E0500", -">* c #270E04", -",* c #382F2C", -"'* c #6B4638", -")* c #64250D", -"!* c #63240D", -"~* c #62230D", -"{* c #401608", -"]* c #722A0F", -"^* c #AB4018", -"/* c #AD421A", -"(* c #AF441A", -"_* c #7E3B20", -":* c #D3D1D1", -"<* c #ECECEC", -"[* c #5F6170", -"}* c #EEEEEF", -"|* c #303246", -"1* c #969696", -"2* c #CCCCCC", -"3* c #5B3324", -"4* c #61230C", -"5* c #60230C", -"6* c #5F230C", -"7* c #5E220C", -"8* c #70290F", -"9* c #AA3F18", -"0* c #973916", -"a* c #301006", -"b* c #312117", -"c* c #31302F", -"d* c #CDCDCD", -"e* c #8F909B", -"f* c #1E1E1E", -"g* c #D2D2D1", -"h* c #696969", -"i* c #583224", -"j* c #5E220B", -"k* c #5D220B", -"l* c #5C210B", -"m* c #6E280F", -"n* c #A83E17", -"o* c #A43E18", -"p* c #561E0C", -"q* c #2B0E05", -"r* c #505162", -"s* c #9F9FA9", -"t* c #BCBDC3", -"u* c #D6D6D6", -"v* c #9D9D9D", -"w* c #737373", -"x* c #694F45", -"y* c #5B200B", -"z* c #5A200B", -"A* c #591F0B", -"B* c #581F0A", -"C* c #381306", -"D* c #6D270E", -"E* c #A63D17", -"F* c #993915", -"G* c #240500", -"H* c #AEAFB7", -"I* c #F0F0F0", -"J* c #575757", -"K* c #CCCCD1", -"L* c #D8D7D7", -"M* c #A49590", -"N* c #561E0A", -"O* c #551D0A", -"P* c #351206", -"Q* c #6B260E", -"R* c #A53C16", -"S* c #903514", -"T* c #8E8E96", -"U* c #9B9BA0", -"V* c #F5F5F5", -"W* c #342721", -"X* c #290E04", -"Y* c #4F1B09", -"Z* c #521C0A", -"`* c #511C09", -" = c #69250D", -".= c #A33B15", -"+= c #822F11", -"@= c #1D0200", -"#= c #838383", -"$= c #6F707E", -"%= c #030000", -"&= c #0B0400", -"*= c #140701", -"== c #3B1406", -"-= c #4E1A09", -";= c #311005", -">= c #68240C", -",= c #802D10", -"'= c #050100", -")= c #919191", -"!= c #010000", -"~= c #0A0300", -"{= c #1D0A02", -"]= c #270D04", -"^= c #351005", -"/= c #100000", -"(= c #111111", -"_= c #0E0501", -":= c #0E0400", -"<= c #070000", -"[= c #909090", -" ", -" . + @ ", -" # $ % & * = - ; > , # ' ", -" ) ! ~ ~ ~ ~ { ] ^ / ( _ : > < [ } | + 1 1 ' ' ", -" 2 3 4 ~ ~ ~ ~ ~ 5 6 7 8 9 0 a b c d e f g h i j ~ ~ 4 3 k ", -" l m ~ n o p q r ~ 4 s t u v w x y z A B C D E F G H 7 I J K L ", -" M N O P Q [ ~ I R S T U V W w x y X Y Z ` ...+.@.#.$.%. ", -" D &.*.N p r ~ I J =.-.;.>.,.'.).!.~.{.].^.Z /.(._.:...<. ", -" [.}.|.1.2.3.~ [ 4.5.7 6.7.8.f 9.0.a.b.c.d.e.f.^.Z g.h.i.j.k. ", -" l.m.n.o.p.q.r.s.t.u.v.R S w.L x.y.z.! ~ ~ A.~ B.C.D.E.F.G.H.I.J. ", -" K.L.M.N.O.P.N 4 Q.R.S.T.U.V.W.X.Y.Z.`. +.+++ +~ @+y z #+$+%+&+*+J. ", -" =+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+++1+2+3+4+5+w x 6+7+8+9+0+a+J. ", -" l.b+c+d+e+f+>+g+h+i+j+k+l+r.m+n+l o+p+(+q+~ ~ r+A.s+j+t+u+v+w+x+y+z+A+B+J. ", -" K.C+D+E+F+G+e+f+H+I+J+K+L+M+N+O+P+Q+X.R+S+T+U+N ~ V+W+X+Y+Z+`+ @.@+@@@#@$@%@ ' ' ' ", -" &@*@=@D+-@;@F+G+>@,@'@)@!@~@{@]@^@/@Q+R+(@_@j+:@<@[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@| | t.", -" c@d@e@f@g@h@i@;@j@k@l@,@'@m@n@o@R+]@p@X.q@r@s@t@j+u@v@w@x@w+y@z@A@B@C@D@E@F@G@H@I@J@| ' ", -" K@L@M@N@j+O@P@i@;@j@Q@R@,@'@m@S@T@U@V@W@X@Y@Z@s@`@ #.#+#@###$#%#&#*#=#-#;#>#F ,#'#R+x. ", -" K@)#!#!#~#{#j+]#^#/#j@e+f+>+(#'+_#:#<#[#}#X@Y@|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#L@ ", -" K@f#g#!#!#!#h#i#j+j#k#d+e+f+l#(#m#n#:#o#p#1.q#r#s#t#u#v#w#x#6#y#z#A#B#C#B@D#E#J. ", -" c@F#G#H#!#!#!#!#I#i#j+J#K#e+f+'@)@m#L#M#N#O#1.P#w+Q#R#S#T#w#U#,.V#W#X#&#A@Y#Z#J. ", -" `# $.$+$@$!#!#!#!##$$$j+%$&$,@'@)@m#*$M#q#+#=$-$;$>$R#,$'$;#)$!$~${$]$&#A@^$J. ", -" `#/$($_$:$<$[$!#!#!#!##$$$i+}$|$'@)@1$2$3$4$5$6$7$;$8$9$0$a$W.b$N c$d$%#&#e$J. ", -" f$g$_+#.h$i$j$k$!#!#!#!#M@l$e@i+m$R@n$o$p$q$r$s$6$t$u$v$X.w$x$y$z$6#A$d$%#B$J. ", -" C$D$0.N E$F$G$p+n+H$I$@$!#!#!#!#M@l$j+J$K$L$M$N$q$r$O$P$Q$R$S$T$U$~ V$x#6#A$d$W$($ ", -" k . 4 ~ X$Y$Z$`$ %L .%+%@%[$!#!#!#!#~#j+#%$%%%M$&%*%P$=%,.-%F ;%D$>%,%w#x#'%)%!% ", -" ~%{%]%++^%/%(%_%:%<%[%G#}%!#!#!#!#j+|%1%$%2%3%4%5%6%7%W#8%9%0%R#S#a%b%c%d% ", -" e%f%g%~ h%i%j%:%k%l%m%n%o%p%q%!#!#j+r%s%t%u%v%M$w%x%y%8%z%A%B%>$C%D%E%F% ", -" e%/$:%G%1+H%I%J%K%L%M%N%O%P%+%Q%R%S%T%U%U%1%V%%%M$N$W%X%Y%6$Z%`% &.&+& ", -" K@@&#&J.$&%&&&N%*&=&-&;&>&,&'&)&.$!&~&{&]&^&1%V%%%M$N$W%/&(&_&:&<&[& ", -" K@}&M%l%|&|&#&;&>&,&1&O%2&3&4&5&6&L@7&8&9&0&a&1%V%%%M$b&c&d&T.e&f&' ", -" g&-&;&>&3&h&O%2&3&i&5&j&k&l&m&n&o&p&q&r&s&0&a&1%V%t&u&d&# E$~ R v&< S$w& ", -" +%x&y&2&3&i&h&j&k&l&m&z&A&h&B&C&D&E&F&r&G&s&0&H&I&J&p+K&-.8 L&~ ~ ~ M&| 3 . $.1 ", -" N&O&P&Q&k&R&S&T&A&h&B&C&U&V&W&X&Y&Z&`&F&r& *.*+*S&@*q+#*$*%*&***=*~ ~ ~ ~ ~ ~ S. ", -" R+R+-*;*>*,*@*}+'*V&W&X&)*!*!*~*{*]*^*`&/*(*_*m+. :*<*[*%*&*=*&*L&}*|*~ ~ ~ ! ", -" R+R+R+f$1*2*O+Z.3*!*~*4*5*6*7*Y&8*9*^*`&0*:%a*b*c*d*=*e*=*&*}*}*&***~ ~ 4 f ", -" R+R+f*8 g*2*7.h*i*7*j*k*l*l*J.m*n*9*^*o*p*q*[&R+R+D$~ r*}*~ [*s*~ ~ ~ , ", -" R+f*i%L&t*-.u*v*w*x*y*z*A*B*C*D*E*n*9*F*_@G*R+R+R+R+!$i%~ e*e*H*~ ~ I*J* ", -" R+R+R+R$3.0.~ ~ }*&*K*-.u*L*M*-#N*O*O*P*Q*R*E*S*_@[& R+R+R+R+D$~ %*s*~ 4 $. ", -" l | ~ ~ ~ ~ ~ ~ T*%*L&&*U*-.V*W*X*Y*Z*`*L@ =.=+=J.@= R+R+R+!$i%~ e&$. ", -" i$#=I*~ e***~ =***=*[*H*$=8 K&%=&=*===-=;=>=,=L@'= R+R+R$)=w. ", -" R+o+$.4 }*$=s*L&&*[*s*s*~ ! l R+R+!=~={=]=C*^=/= R+R+(= ", -" R+R+l # $ ~ s*$=L&s*L&~ e&K R+R+R+R+_=:=<= ", -" R+R+s.[=e&~ **e*~ ~ | ) R+R+R+ ", -" R+R+i$3.! ~ d*4 , ' ", -" R+R+s.# J ) o+ ", -" R+R+X.'# ", -" ", -" "}; diff -Naur WindowMaker-0.91.0/wrlib/bench.h wm/wrlib/bench.h --- WindowMaker-0.91.0/wrlib/bench.h 1970-01-01 03:00:00 +0300 +++ wm/wrlib/bench.h 2004-10-13 01:28:29 +0400 @@ -0,0 +1,68 @@ + + + +inline static void +cycle_bench(int start) +{ + static volatile unsigned int start_cycle; + + if (start) { + asm volatile + ("pushl %%edx \n\t" + "rdtsc \n\t" + "movl %%eax,%0 \n\t" + "cld \n\t" + "popl %%edx \n\t" + "nop \n\t" + "nop \n\t" + "nop \n\t" + "nop \n\t" + "nop \n\t" + "nop \n\t" + "nop \n\t" + "nop \n\t" + : "=m" (start_cycle) : : "eax", "edx"); + } else { + volatile int end; + + asm volatile + ("pushl %%edx \n\t" + "clc \n\t" + "rdtsc \n\t" + "movl %%eax, %0 \n\t" + "popl %%edx \n\t" + : "=m" (end) : : "eax", "edx"); + + printf("Cycle count = %u\n", end - start_cycle - 68); + } +} + + + +#if 0 +// seems linux doesnt allow user progs to exec rdpcm.. +inline static void +cache_bench(int start) +{ + static int start_cycle; + + if (start) { + asm volatile + ("movl $1,%%ecx \n\t" + "rdpmc \n\t" + "movl %%eax,%0 \n\t" + : "=m" (start_cycle)); + } else { + int end; + + asm volatile + ("movl $1,%%ecx \n\t" + "rdpmc \n\t" + "movl %%eax,%0" + : "=m" (end)); + + printf("Cache reloads counted = %i\n", end - start_cycle); + } +} + +#endif diff -Naur WindowMaker-0.91.0/wrlib/CVS/Entries wm/wrlib/CVS/Entries --- WindowMaker-0.91.0/wrlib/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/wrlib/CVS/Entries 2005-05-17 22:43:32 +0400 @@ -0,0 +1,42 @@ +/.cvsignore/1.6/Thu Jan 6 15:48:42 2005// +/AUTHORS/1.1.1.1/Tue Sep 29 22:36:29 1998// +/COPYING/1.1.1.1/Tue Sep 29 22:36:29 1998// +/ChangeLog/1.9/Mon Sep 30 12:39:24 2002// +/CmapAlloc.c/1.3/Tue Oct 12 21:28:29 2004// +/CrCmap.c/1.3/Tue Oct 12 21:28:29 2004// +/DelCmap.c/1.2/Tue Oct 12 21:28:29 2004// +/INSTALL/1.1.1.1/Tue Sep 29 22:36:29 1998// +/LookupCmap.c/1.3/Tue Oct 12 21:28:29 2004// +/Makefile.am/1.29/Thu Jan 6 15:48:42 2005// +/NEWS/1.2/Sat Apr 21 07:12:35 2001// +/README/1.1.1.1/Tue Sep 29 22:36:29 1998// +/StdCmap.c/1.3/Tue Oct 12 21:28:29 2004// +/StdCmap.h/1.1/Tue Nov 16 00:13:21 1999// +/TODO/1.5/Mon Sep 30 12:39:24 2002// +/alloca.c/1.2/Tue Oct 12 21:28:29 2004// +/bench.h/1.3/Tue Oct 12 21:28:29 2004// +/color.c/1.4/Tue Oct 12 21:28:29 2004// +/configure.in/1.1.1.1/Tue Sep 29 22:36:29 1998// +/context.c/1.18/Tue Oct 12 21:28:29 2004// +/convert.c/1.36/Tue Oct 12 21:28:29 2004// +/convolve.c/1.9/Tue Oct 12 21:28:29 2004// +/draw.c/1.11/Sat Oct 23 03:30:04 2004// +/gif.c/1.10/Tue Oct 12 21:28:29 2004// +/gradient.c/1.19/Tue Oct 12 21:28:29 2004// +/jpeg.c/1.14/Tue Oct 12 21:28:29 2004// +/load.c/1.9/Tue Oct 12 21:28:29 2004// +/misc.c/1.11/Tue Oct 12 21:28:29 2004// +/nxpm.c/1.17/Tue Oct 12 21:28:29 2004// +/png.c/1.15/Tue Oct 12 21:28:29 2004// +/ppm.c/1.9/Tue Oct 12 21:28:29 2004// +/raster.c/1.26/Mon Oct 25 00:07:51 2004// +/rotate.c/1.8/Tue Oct 12 21:28:29 2004// +/save.c/1.4/Tue Oct 12 21:28:29 2004// +/scale.c/1.17/Tue Oct 12 21:28:29 2004// +/tiff.c/1.7/Tue Oct 12 21:28:29 2004// +/wraster.h/1.29/Sun Oct 24 05:01:55 2004// +/x86_specific.c/1.14/Sun Oct 31 01:47:43 2004// +/xpixmap.c/1.11/Tue Oct 12 21:28:29 2004// +/xpm.c/1.11/Tue Oct 12 21:28:29 2004// +/xutil.c/1.10/Tue Oct 12 21:28:29 2004// +D diff -Naur WindowMaker-0.91.0/wrlib/CVS/Entries.Log wm/wrlib/CVS/Entries.Log --- WindowMaker-0.91.0/wrlib/CVS/Entries.Log 1970-01-01 03:00:00 +0300 +++ wm/wrlib/CVS/Entries.Log 2005-05-17 22:43:32 +0400 @@ -0,0 +1 @@ +A D/tests//// diff -Naur WindowMaker-0.91.0/wrlib/CVS/Repository wm/wrlib/CVS/Repository --- WindowMaker-0.91.0/wrlib/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/wrlib/CVS/Repository 2005-05-17 22:43:30 +0400 @@ -0,0 +1 @@ +wm/wrlib diff -Naur WindowMaker-0.91.0/wrlib/CVS/Root wm/wrlib/CVS/Root --- WindowMaker-0.91.0/wrlib/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/wrlib/CVS/Root 2005-05-17 22:43:30 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/wrlib/.cvsignore wm/wrlib/.cvsignore --- WindowMaker-0.91.0/wrlib/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/wrlib/.cvsignore 2005-01-06 18:48:42 +0300 @@ -0,0 +1,5 @@ +Makefile Makefile.in +*.lo *.la +get-wraster-flags +.libs *.pc +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/wrlib/Makefile.am wm/wrlib/Makefile.am --- WindowMaker-0.91.0/wrlib/Makefile.am 2004-10-26 08:09:57 +0400 +++ wm/wrlib/Makefile.am 2005-01-06 18:48:42 +0300 @@ -1,5 +1,7 @@ ## automake input file for wrlib +SUBDIRS = . tests + AUTOMAKE_OPTIONS = no-dependencies lib_LTLIBRARIES = libwraster.la @@ -8,9 +10,6 @@ bin_SCRIPTS = get-wraster-flags -noinst_PROGRAMS = testgrad testdraw view testrot - -EXTRA_DIST = test.png tile.xpm ballot_box.xpm include_HEADERS = wraster.h libwraster_la_SOURCES = \ @@ -57,26 +56,6 @@ INCLUDES = $(DFLAGS) @HEADER_SEARCH_PATH@ -LIBLIST = $(top_builddir)/wrlib/libwraster.la - -view_SOURCES= view.c - -view_LDADD = $(LIBLIST) - -testgrad_SOURCES = testgrad.c - -testgrad_LDADD = $(LIBLIST) - -testrot_SOURCES = testrot.c - -testrot_LDADD = $(LIBLIST) - - -testdraw_SOURCES = testdraw.c - -testdraw_LDADD = $(LIBLIST) - - libwraster_la_LIBADD = @ALLOCA@ @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm DISTCLEANFILES = wrlib.pc diff -Naur WindowMaker-0.91.0/wrlib/Makefile.in wm/wrlib/Makefile.in --- WindowMaker-0.91.0/wrlib/Makefile.in 2004-10-26 08:10:46 +0400 +++ wm/wrlib/Makefile.in 1970-01-01 03:00:00 +0300 @@ -1,502 +0,0 @@ -# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am - -# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - - -SHELL = @SHELL@ - -srcdir = @srcdir@ -top_srcdir = @top_srcdir@ -VPATH = @srcdir@ -prefix = @prefix@ -exec_prefix = @exec_prefix@ - -bindir = @bindir@ -sbindir = @sbindir@ -libexecdir = @libexecdir@ -datadir = @datadir@ -sysconfdir = @sysconfdir@ -sharedstatedir = @sharedstatedir@ -localstatedir = @localstatedir@ -libdir = @libdir@ -infodir = @infodir@ -mandir = @mandir@ -includedir = @includedir@ -oldincludedir = /usr/include - -DESTDIR = - -pkgdatadir = $(datadir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ - -top_builddir = .. - -ACLOCAL = @ACLOCAL@ -AUTOCONF = @AUTOCONF@ -AUTOMAKE = @AUTOMAKE@ -AUTOHEADER = @AUTOHEADER@ - -INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -transform = @program_transform_name@ - -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -host_alias = @host_alias@ -host_triplet = @host@ -AR = @AR@ -AS = @AS@ -CC = @CC@ -CPP_PATH = @CPP_PATH@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -DLLIBS = @DLLIBS@ -DLLTOOL = @DLLTOOL@ -ECHO = @ECHO@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -GCJ = @GCJ@ -GCJFLAGS = @GCJFLAGS@ -GFXLIBS = @GFXLIBS@ -HAVE_LIB = @HAVE_LIB@ -HEADER_SEARCH_PATH = @HEADER_SEARCH_PATH@ -ICONEXT = @ICONEXT@ -INTLIBS = @INTLIBS@ -LIB = @LIB@ -LIBRARY_SEARCH_PATH = @LIBRARY_SEARCH_PATH@ -LIBTOOL = @LIBTOOL@ -LITE = @LITE@ -LN_S = @LN_S@ -LTLIB = @LTLIB@ -MAKEINFO = @MAKEINFO@ -MOFILES = @MOFILES@ -NETLIBS = @NETLIBS@ -NLSDIR = @NLSDIR@ -NOSTRICTALIASING = @NOSTRICTALIASING@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -PACKAGE = @PACKAGE@ -PKGCONFIG = @PKGCONFIG@ -RANLIB = @RANLIB@ -RC = @RC@ -STRIP = @STRIP@ -VERSION = @VERSION@ -WINGSMOFILES = @WINGSMOFILES@ -WPMOFILES = @WPMOFILES@ -XCFLAGS = @XCFLAGS@ -XFTCONFIG = @XFTCONFIG@ -XFTFLAGS = @XFTFLAGS@ -XFTLIBS = @XFTLIBS@ -XGETTEXT = @XGETTEXT@ -XLFLAGS = @XLFLAGS@ -XLIBS = @XLIBS@ -X_EXTRA_LIBS = @X_EXTRA_LIBS@ -X_LIBRARY_PATH = @X_LIBRARY_PATH@ -supported_locales = @supported_locales@ -wprefsdir = @wprefsdir@ - -AUTOMAKE_OPTIONS = no-dependencies - -lib_LTLIBRARIES = libwraster.la - -libwraster_la_LDFLAGS = -version-info 4:0:1 - -bin_SCRIPTS = get-wraster-flags - -noinst_PROGRAMS = testgrad testdraw view testrot - -EXTRA_DIST = test.png tile.xpm ballot_box.xpm -include_HEADERS = wraster.h - -libwraster_la_SOURCES = LookupCmap.c StdCmap.c StdCmap.h CrCmap.c DelCmap.c CmapAlloc.c raster.c draw.c color.c load.c save.c gradient.c xpixmap.c convert.c x86_specific.c context.c misc.c scale.c rotate.c convolve.c nxpm.c xpm.c xutil.c ppm.c png.c jpeg.c tiff.c gif.c - - -LTCOMPILE2 = `echo $(LTCOMPILE) | sed -e s/-fomit-frame-pointer//` -COMPILE2 = `echo $(COMPILE) | sed -e s/-fomit-frame-pointer//` - -INCLUDES = $(DFLAGS) @HEADER_SEARCH_PATH@ - -LIBLIST = $(top_builddir)/wrlib/libwraster.la - -view_SOURCES = view.c - -view_LDADD = $(LIBLIST) - -testgrad_SOURCES = testgrad.c - -testgrad_LDADD = $(LIBLIST) - -testrot_SOURCES = testrot.c - -testrot_LDADD = $(LIBLIST) - -testdraw_SOURCES = testdraw.c - -testdraw_LDADD = $(LIBLIST) - -libwraster_la_LIBADD = @ALLOCA@ @LIBRARY_SEARCH_PATH@ @GFXLIBS@ @XLIBS@ -lm - -DISTCLEANFILES = wrlib.pc -mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../src/config.h -CONFIG_CLEAN_FILES = -LTLIBRARIES = $(lib_LTLIBRARIES) - - -DEFS = @DEFS@ -I. -I$(srcdir) -I../src -CPPFLAGS = @CPPFLAGS@ -LDFLAGS = @LDFLAGS@ -LIBS = @LIBS@ -X_CFLAGS = @X_CFLAGS@ -X_LIBS = @X_LIBS@ -X_PRE_LIBS = @X_PRE_LIBS@ -libwraster_la_DEPENDENCIES = @ALLOCA@ -libwraster_la_OBJECTS = LookupCmap.lo StdCmap.lo CrCmap.lo DelCmap.lo \ -CmapAlloc.lo raster.lo draw.lo color.lo load.lo save.lo gradient.lo \ -xpixmap.lo convert.lo x86_specific.lo context.lo misc.lo scale.lo \ -rotate.lo convolve.lo nxpm.lo xpm.lo xutil.lo ppm.lo png.lo jpeg.lo \ -tiff.lo gif.lo -noinst_PROGRAMS = testgrad$(EXEEXT) testdraw$(EXEEXT) view$(EXEEXT) \ -testrot$(EXEEXT) -PROGRAMS = $(noinst_PROGRAMS) - -testgrad_OBJECTS = testgrad.$(OBJEXT) -testgrad_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la -testgrad_LDFLAGS = -testdraw_OBJECTS = testdraw.$(OBJEXT) -testdraw_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la -testdraw_LDFLAGS = -view_OBJECTS = view.$(OBJEXT) -view_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la -view_LDFLAGS = -testrot_OBJECTS = testrot.$(OBJEXT) -testrot_DEPENDENCIES = $(top_builddir)/wrlib/libwraster.la -testrot_LDFLAGS = -SCRIPTS = $(bin_SCRIPTS) - -CFLAGS = @CFLAGS@ -COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -HEADERS = $(include_HEADERS) - -DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \ -Makefile.in NEWS TODO alloca.c configure.in - - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = tar -GZIP_ENV = --best -SOURCES = $(libwraster_la_SOURCES) $(testgrad_SOURCES) $(testdraw_SOURCES) $(view_SOURCES) $(testrot_SOURCES) -OBJECTS = $(libwraster_la_OBJECTS) $(testgrad_OBJECTS) $(testdraw_OBJECTS) $(view_OBJECTS) $(testrot_OBJECTS) - -all: all-redirect -.SUFFIXES: -.SUFFIXES: .S .c .lo .o .obj .s -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps wrlib/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - - -mostlyclean-libLTLIBRARIES: - -clean-libLTLIBRARIES: - -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - -distclean-libLTLIBRARIES: - -maintainer-clean-libLTLIBRARIES: - -install-libLTLIBRARIES: $(lib_LTLIBRARIES) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - if test -f $$p; then \ - echo "$(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p"; \ - $(LIBTOOL) --mode=install $(INSTALL) $$p $(DESTDIR)$(libdir)/$$p; \ - else :; fi; \ - done - -uninstall-libLTLIBRARIES: - @$(NORMAL_UNINSTALL) - list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \ - done - -.c.o: - $(COMPILE) -c $< - -# FIXME: We should only use cygpath when building on Windows, -# and only if it is available. -.c.obj: - $(COMPILE) -c `cygpath -w $<` - -.s.o: - $(COMPILE) -c $< - -.S.o: - $(COMPILE) -c $< - -mostlyclean-compile: - -rm -f *.o core *.core - -rm -f *.$(OBJEXT) - -clean-compile: - -distclean-compile: - -rm -f *.tab.c - -maintainer-clean-compile: - -.c.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.s.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -.S.lo: - $(LIBTOOL) --mode=compile $(COMPILE) -c $< - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -distclean-libtool: - -maintainer-clean-libtool: - -libwraster.la: $(libwraster_la_OBJECTS) $(libwraster_la_DEPENDENCIES) - $(LINK) -rpath $(libdir) $(libwraster_la_LDFLAGS) $(libwraster_la_OBJECTS) $(libwraster_la_LIBADD) $(LIBS) - -mostlyclean-noinstPROGRAMS: - -clean-noinstPROGRAMS: - -test -z "$(noinst_PROGRAMS)" || rm -f $(noinst_PROGRAMS) - -distclean-noinstPROGRAMS: - -maintainer-clean-noinstPROGRAMS: - -testgrad$(EXEEXT): $(testgrad_OBJECTS) $(testgrad_DEPENDENCIES) - @rm -f testgrad$(EXEEXT) - $(LINK) $(testgrad_LDFLAGS) $(testgrad_OBJECTS) $(testgrad_LDADD) $(LIBS) - -testdraw$(EXEEXT): $(testdraw_OBJECTS) $(testdraw_DEPENDENCIES) - @rm -f testdraw$(EXEEXT) - $(LINK) $(testdraw_LDFLAGS) $(testdraw_OBJECTS) $(testdraw_LDADD) $(LIBS) - -view$(EXEEXT): $(view_OBJECTS) $(view_DEPENDENCIES) - @rm -f view$(EXEEXT) - $(LINK) $(view_LDFLAGS) $(view_OBJECTS) $(view_LDADD) $(LIBS) - -testrot$(EXEEXT): $(testrot_OBJECTS) $(testrot_DEPENDENCIES) - @rm -f testrot$(EXEEXT) - $(LINK) $(testrot_LDFLAGS) $(testrot_OBJECTS) $(testrot_LDADD) $(LIBS) - -install-binSCRIPTS: $(bin_SCRIPTS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(bindir) - @list='$(bin_SCRIPTS)'; for p in $$list; do \ - if test -f $$p; then \ - echo " $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else if test -f $(srcdir)/$$p; then \ - echo " $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`"; \ - $(INSTALL_SCRIPT) $(srcdir)/$$p $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - else :; fi; fi; \ - done - -uninstall-binSCRIPTS: - @$(NORMAL_UNINSTALL) - list='$(bin_SCRIPTS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(bindir)/`echo $$p|sed '$(transform)'`; \ - done - -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir) - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/$$p; \ - done - -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/$$p; \ - done - -tags: TAGS - -ID: $(HEADERS) $(SOURCES) $(LISP) - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - here=`pwd` && cd $(srcdir) \ - && mkid -f$$here/ID $$unique $(LISP) - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) $(LISP) - tags=; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS)'; \ - unique=`for i in $$list; do echo $$i; done | \ - awk ' { files[$$0] = 1; } \ - END { for (i in files) print i; }'`; \ - test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \ - || (cd $(srcdir) && etags -o $$here/TAGS $(ETAGS_ARGS) $$tags $$unique $(LISP)) - -mostlyclean-tags: - -clean-tags: - -distclean-tags: - -rm -f TAGS ID - -maintainer-clean-tags: - -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) - -subdir = wrlib - -distdir: $(DISTFILES) - @for file in $(DISTFILES); do \ - d=$(srcdir); \ - if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ - else \ - test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ - fi; \ - done -info-am: -info: info-am -dvi-am: -dvi: dvi-am -check-am: all-am -check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: install-libLTLIBRARIES install-binSCRIPTS \ - install-exec-local -install-exec: install-exec-am - -install-data-am: install-includeHEADERS -install-data: install-data-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am -install: install-am -uninstall-am: uninstall-libLTLIBRARIES uninstall-binSCRIPTS \ - uninstall-includeHEADERS -uninstall: uninstall-am -all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(HEADERS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: - $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(bindir) \ - $(DESTDIR)$(includedir) - - -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* - -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES) - -maintainer-clean-generic: -mostlyclean-am: mostlyclean-libLTLIBRARIES mostlyclean-compile \ - mostlyclean-libtool mostlyclean-noinstPROGRAMS \ - mostlyclean-tags mostlyclean-generic - -mostlyclean: mostlyclean-am - -clean-am: clean-libLTLIBRARIES clean-compile clean-libtool \ - clean-noinstPROGRAMS clean-tags clean-generic \ - mostlyclean-am - -clean: clean-am - -distclean-am: distclean-libLTLIBRARIES distclean-compile \ - distclean-libtool distclean-noinstPROGRAMS \ - distclean-tags distclean-generic clean-am - -rm -f libtool - -distclean: distclean-am - -maintainer-clean-am: maintainer-clean-libLTLIBRARIES \ - maintainer-clean-compile maintainer-clean-libtool \ - maintainer-clean-noinstPROGRAMS maintainer-clean-tags \ - maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." - -maintainer-clean: maintainer-clean-am - -.PHONY: mostlyclean-libLTLIBRARIES distclean-libLTLIBRARIES \ -clean-libLTLIBRARIES maintainer-clean-libLTLIBRARIES \ -uninstall-libLTLIBRARIES install-libLTLIBRARIES mostlyclean-compile \ -distclean-compile clean-compile maintainer-clean-compile \ -mostlyclean-libtool distclean-libtool clean-libtool \ -maintainer-clean-libtool mostlyclean-noinstPROGRAMS \ -distclean-noinstPROGRAMS clean-noinstPROGRAMS \ -maintainer-clean-noinstPROGRAMS uninstall-binSCRIPTS install-binSCRIPTS \ -uninstall-includeHEADERS install-includeHEADERS tags mostlyclean-tags \ -distclean-tags clean-tags maintainer-clean-tags distdir info-am info \ -dvi-am dvi check check-am installcheck-am installcheck \ -install-exec-local install-exec-am install-exec install-data-am \ -install-data install-am install uninstall-am uninstall all-redirect \ -all-am all installdirs mostlyclean-generic distclean-generic \ -clean-generic maintainer-clean-generic clean mostlyclean distclean \ -maintainer-clean - - -# cant compile asm stuff with optimizations -x86_specific.lo: x86_specific.c - $(LTCOMPILE2) -O0 -c $< - -x86_specific.o: x86_specific.c - $(COMPILE2) -O0 -c $< - -install-exec-local: - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(libdir)/pkgconfig - @list='wrlib.pc'; for p in $$list; do \ - if test -f $$p; then \ - echo "$(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/"; \ - $(INSTALL_DATA) $$p $(DESTDIR)$(libdir)/pkgconfig/; \ - else :; fi; \ - done - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff -Naur WindowMaker-0.91.0/wrlib/testdraw.c wm/wrlib/testdraw.c --- WindowMaker-0.91.0/wrlib/testdraw.c 2004-10-12 22:23:16 +0400 +++ wm/wrlib/testdraw.c 1970-01-01 03:00:00 +0300 @@ -1,634 +0,0 @@ - -#include -#include "wraster.h" -#include -#include -#include - -#include -#include - - -Display *dpy; -RContext *ctx; -char *ProgName; - - -void -testDraw() -{ - RImage *img, *tile, *icon, *tmp; - RColor color, from, to; - RColor cdelta; - RSegment segs[20]; - int i, x, y; - XSetWindowAttributes val; - Pixmap pix, back; - Window win; - - val.background_pixel = ctx->black; - val.colormap = ctx->cmap; - win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, 128, 256, - 0, ctx->depth, InputOutput, ctx->visual, - CWColormap|CWBackPixel, &val); - back = XCreatePixmap(ctx->dpy, ctx->drawable, 128, 256, ctx->depth); - - /* Dark blue tile gradient */ - from.red = 0x28; - from.green = 0x45; - from.blue = 0x69; - from.alpha = 0xff; - to.red = 0x08; - to.green = 0x24; - to.blue = 0x20; - to.alpha = 0xff; - - /* Standard gray tile gradient */ - /*from.red = 0xa6; - from.green = 0xa6; - from.blue = 0xb6; - from.alpha = 0xff; - to.red = 0x51; - to.green = 0x55; - to.blue = 0x61; - to.alpha = 0xff;*/ - - /* Make the tile, and put it as a sample in the first place */ - tile = RRenderGradient(64, 64, &from, &to, RGRD_DIAGONAL); - img = RCloneImage(tile); - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 0, 0); - - /* Read the image, and combine it with the tile. Put it as a sample - * in the second slot, and also save a copy for later use. */ - icon = RLoadImage(ctx, "ballot_box.xpm", 0); - if (!icon) { - puts(RMessageForError(RErrorCode)); - exit(1); - } - RCombineArea(img, icon, 0, 0, icon->width, icon->height, 8, 8); - RReleaseImage(icon); - tmp = img; - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 64, 0); - - img = RCloneImage(tile); - - /* Draw random pixels on image */ - for (i=0; i< 200; i++) { - color.red = rand()%256; - color.green = rand()%256; - color.blue = rand()%256; - color.alpha = 255; - x = rand()%64; - y = rand()%64; - RPutPixel(img, x, y, &color); - } - - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 0, 64); - - RReleaseImage(img); - img = RCloneImage(tile); - - /* Alter random pixels in image with the same amount for r/g/b */ - for (i=0; i< 200; i++) { - cdelta.red = cdelta.green = cdelta.blue = rand()%511 - 255; - cdelta.alpha = 0; - x = rand()%64; - y = rand()%64; - ROperatePixel(img, RAddOperation, x, y, &cdelta); - } - - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 64, 64); - - RReleaseImage(img); - img = RCloneImage(tile); - - /* Draw lines in all directions to test different slopes */ - color.red = 0xff; - color.green = 0x7d; - color.blue = 0x52; - color.alpha = 0xff; - for (i=0; i<16; i++) - segs[i].x1 = segs[i].y1 = 31; - - segs[6].x2 = segs[7].x2 = segs[8].x2 = segs[9].x2 = segs[10].x2 = 0; - segs[2].y2 = segs[3].y2 = segs[4].y2 = segs[5].y2 = segs[6].y2 = 0; - segs[5].x2 = segs[11].x2 = 16; - segs[1].y2 = segs[7].y2 = 16; - segs[4].x2 = segs[12].x2 = 31; - segs[0].y2 = segs[8].y2 = 31; - segs[3].x2 = segs[13].x2 = 46; - segs[9].y2 = segs[15].y2 = 46; - segs[0].x2 = segs[1].x2 = segs[2].x2 = segs[14].x2 = segs[15].x2 = 62; - segs[10].y2 = segs[11].y2 = segs[12].y2 = segs[13].y2 = segs[14].y2 = 62; - RDrawSegments(img, segs, 9, &color); - - /* Also test how alpha channel behaves when drawing lines */ - color.alpha = 0x80; - RDrawSegments(img, &segs[9], 7, &color); - - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 0, 128); - - RReleaseImage(img); - img = RCloneImage(tile); - - /* Alter lines in all directions (test different slopes) */ - cdelta.red = cdelta.green = cdelta.blue = 80; - cdelta.alpha = 0; - ROperateSegments(img, RAddOperation, segs, 16, &cdelta); - - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 64, 128); - - RReleaseImage(img); - - /* Create a bevel around the icon, and save it for a later use */ - img = tmp; - cdelta.red = cdelta.green = cdelta.blue = 80; - cdelta.alpha = 0; - ROperateLine(img, RAddOperation, 8, 8, 56, 8, &cdelta); - ROperateLine(img, RAddOperation, 8, 9, 8, 56, &cdelta); - cdelta.red = cdelta.green = cdelta.blue = 40; - cdelta.alpha = 0; - ROperateLine(img, RSubtractOperation, 8, 56, 56, 56, &cdelta); - ROperateLine(img, RSubtractOperation, 56, 8, 56, 55, &cdelta); - RReleaseImage(tile); - tmp = RCloneImage(img); - - /* Draw some solid lines over the icon */ - color.red = 0xff; - color.green = 0x7d; - color.blue = 0x52; - color.alpha = 0xff; - for (i=16; i<24; i++) { - RDrawLine(img, 9, i, 55, i, &color); - } - - /* Also try some lines with alpha over the icon */ - color.alpha = 0x80; - for (i=40; i<48; i++) { - RDrawLine(img, 9, i, 55, i, &color); - } - - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 0, 192); - - RReleaseImage(img); - - /* Restore the image with the icon, and alter some lines */ - img = tmp; - cdelta.red = cdelta.green = cdelta.blue = 80; - cdelta.alpha = 0; - for (i=16; i<24; i++) { - ROperateLine(img, RSubtractOperation, 9, i, 55, i, &cdelta); - } - cdelta.red = cdelta.green = cdelta.blue = 80; - for (i=40; i<48; i++) { - ROperateLine(img, RAddOperation, 9, i, 55, i, &cdelta); - } - - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 64, 192); - - - XSetWindowBackgroundPixmap(dpy, win, back); - XMapRaised(dpy, win); - XClearWindow(dpy, win); - XFlush(dpy); -} - - -void -testBevel() -{ - RImage *img, *tile; - RColor color, from, to; - XSetWindowAttributes val; - Pixmap pix, back; - Window win; - - val.background_pixel = ctx->black; - val.colormap = ctx->cmap; - win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, 140, 140, - 0, ctx->depth, InputOutput, ctx->visual, - CWColormap|CWBackPixel, &val); - back = XCreatePixmap(ctx->dpy, ctx->drawable, 140, 140, ctx->depth); - - /* Standard gray tile gradient */ - from.red = 0xa6; - from.green = 0xa6; - from.blue = 0xb6; - from.alpha = 0xff; - to.red = 0x51; - to.green = 0x55; - to.blue = 0x61; - to.alpha = 0xff; - - /* Dark blue tile gradient */ - /*from.red = 0x28; - from.green = 0x45; - from.blue = 0x69; - from.alpha = 0xff; - to.red = 0x08; - to.green = 0x24; - to.blue = 0x20; - to.alpha = 0xff;*/ - - /* Create Background */ - img = RCreateImage(140, 140, True); - color.red = 0x28; - color.green = 0x45; - color.blue = 0x69; - color.alpha = 0xff; - RClearImage(img, &color); - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 140, 140, 0, 0); - RReleaseImage(img); - - tile = RRenderGradient(64, 64, &from, &to, RGRD_DIAGONAL); - - img = RCloneImage(tile); - RBevelImage(img, RBEV_SUNKEN); - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 3, 3); - RReleaseImage(img); - - img = RCloneImage(tile); - RBevelImage(img, RBEV_RAISED); - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 73, 3); - RReleaseImage(img); - - img = RCloneImage(tile); - RBevelImage(img, RBEV_RAISED2); - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 3, 73); - RReleaseImage(img); - - img = RCloneImage(tile); - RBevelImage(img, RBEV_RAISED3); - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 73, 73); - RReleaseImage(img); - - XSetWindowBackgroundPixmap(dpy, win, back); - XMapRaised(dpy, win); - XClearWindow(dpy, win); - XFlush(dpy); -} - - -void testScale() -{ - RImage *image; - RImage *scaled; - XSetWindowAttributes val; - Pixmap pix; - Window win; - - val.background_pixel = ctx->black; - val.colormap = ctx->cmap; - win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, 140, 140, - 0, ctx->depth, InputOutput, ctx->visual, - CWColormap|CWBackPixel, &val); - XStoreName(dpy, win, "Scale"); - pix = XCreatePixmap(ctx->dpy, ctx->drawable, 140, 140, ctx->depth); - - image = RLoadImage(ctx, "ballot_box.xpm", 0); - if (!image) { - puts("couldnt load ballot_box.xpm"); - return; - } - - scaled = RScaleImage(image, 140, 140); - - RReleaseImage(image); - RConvertImage(ctx, scaled, &pix); - XSetWindowBackgroundPixmap(dpy, win, pix); - XMapRaised(dpy, win); - XClearWindow(dpy, win); - XFlush(dpy); -} - - -void testRotate() -{ - - RImage *image; - RImage *rotated; - XSetWindowAttributes val; - Pixmap pix; - Window win; - - image = RLoadImage(ctx, "ballot_box.xpm", 0); - if (!image) { - puts("couldnt load ballot_box.xpm"); - return; - } - - image = RScaleImage(image, 90, 180); - - - val.background_pixel = ctx->black; - val.colormap = ctx->cmap; - win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, image->height, - image->width, - 0, ctx->depth, InputOutput, ctx->visual, - CWColormap|CWBackPixel, &val); - XStoreName(dpy, win, "Rotate"); - pix = XCreatePixmap(ctx->dpy, ctx->drawable, image->height, image->width, - ctx->depth); - - rotated = RRotateImage(image, 90.0); - - RReleaseImage(image); - RConvertImage(ctx, rotated, &pix); - XSetWindowBackgroundPixmap(dpy, win, pix); - XMapRaised(dpy, win); - XClearWindow(dpy, win); - XFlush(dpy); -} - - - -void -drawClip() -{ - RImage *img; - RColor color, from, to, tmp; - RColor cdelta, cdelta1; - RSegment segs[20]; - XSetWindowAttributes val; - Pixmap pix, back; - Window win; - - val.background_pixel = ctx->black; - val.colormap = ctx->cmap; - win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, 64, 64, - 0, ctx->depth, InputOutput, ctx->visual, - CWColormap|CWBackPixel, &val); - back = XCreatePixmap(ctx->dpy, ctx->drawable, 64, 64, ctx->depth); - - /* Standard gray tile gradient */ - from.red = 0xa6; - from.green = 0xa6; - from.blue = 0xb6; - from.alpha = 0xff; - to.red = 0x51; - to.green = 0x55; - to.blue = 0x61; - to.alpha = 0xff; - - /* Dark blue tile gradient */ - from.red = 0x28; - from.green = 0x45; - from.blue = 0x69; - from.alpha = 0xff; - to.red = 0x08; - to.green = 0x24; - to.blue = 0x20; - to.alpha = 0xff; - - img = RRenderGradient(64, 64, &from, &to, RGRD_DIAGONAL); - - RBevelImage(img, RBEV_RAISED3); -#if 1 - color.alpha = 255; - color.red = color.green = color.blue = 0; - - cdelta.alpha = 0; - cdelta.red = cdelta.green = cdelta.blue = 80; - - cdelta1.alpha = 0; - cdelta1.red = cdelta1.green = cdelta1.blue = 40; - - segs[0].x1 = segs[2].y1 = segs[4].x1 = segs[4].x2 = 63-21; - segs[0].x2 = segs[2].y2 = segs[1].x2 = segs[3].y2 = 63-2; - segs[0].y1 = segs[2].x1 = segs[1].y1 = segs[3].x1 = 2; - segs[0].y2 = segs[2].x2 = segs[6].x1 = segs[6].x2 = 21; - segs[1].x1 = segs[3].y1 = segs[5].x1 = segs[5].x2 = 63-22; - segs[1].y2 = segs[3].x2 = segs[7].x1 = segs[7].x2 = 22; - - segs[4].y1 = segs[5].y1 = segs[10].x1 = segs[11].x1 = 0; - segs[4].y2 = segs[5].y2 = segs[10].x2 = segs[11].x2 = 1; - segs[6].y1 = segs[7].y1 = segs[8].x1 = segs[9].x1 = 63-1; - segs[6].y2 = segs[7].y2 = segs[8].x2 = segs[9].x2 = 63; - segs[8].y1 = segs[8].y2 = 21; - segs[9].y1 = segs[9].y2 = 22; - segs[10].y1 = segs[10].y2 = 63-21; - segs[11].y1 = segs[11].y2 = 63-22; - /* Black segments */ - RDrawSegments(img, segs, 12, &color); - - segs[0].x1 = segs[3].y1 = 63-20; - segs[0].x2 = segs[1].y2 = segs[2].x2 = segs[3].y2 = 63-2; - segs[0].y1 = segs[1].x1 = segs[2].y1 = segs[3].x1 = 2; - segs[1].y1 = segs[2].x1 = 63-23; - segs[0].y2 = segs[3].x2 = 20; - segs[1].x2 = segs[2].y2 = 23; - /* Bevels arround black segments */ - ROperateSegments(img, RAddOperation, segs, 2, &cdelta); - ROperateSegments(img, RSubtractOperation, &segs[2], 2 ,&cdelta1); - - RGetPixel(img, 63-2, 20, &tmp); - /*RPutPixel(img, 63-1, 23, &tmp);*/ - RDrawLine(img, 63-1, 23, 63, 23, &tmp); - RGetPixel(img, 63-23, 2, &tmp); - RDrawLine(img, 63-23, 0, 63-23, 1, &tmp); - - RGetPixel(img, 23, 63-2, &tmp); - /*RPutPixel(img, 23, 63-1, &tmp);*/ - RDrawLine(img, 23, 63-1, 23, 63, &tmp); - RGetPixel(img, 2, 63-20, &tmp); - RDrawLine(img, 0, 63-23, 1, 63-23, &tmp); -#else - color.alpha = 255; - color.red = color.green = color.blue = 0; - - cdelta.alpha = 0; - cdelta.red = cdelta.green = cdelta.blue = 80; - - cdelta1.alpha = 0; - cdelta1.red = cdelta1.green = cdelta1.blue = 40; - - RDrawLine(img, 63-21, 2, 63-2, 21, &color); /* upper 2 black lines */ - ROperateLine(img, RAddOperation, 63-20, 2, 63-2, 20, &cdelta); /* the bevel arround them */ - ROperateLine(img, RSubtractOperation, 63-22, 2, 63-2, 22, &cdelta1); - RDrawLine(img, 63-21, 0, 63-21, 1, &color); /* upper small black lines */ - RDrawLine(img, 63-1, 21, 63, 21, &color); - - RGetPixel(img, 63-2, 20, &tmp); - RPutPixel(img, 63-1, 22, &tmp); - RGetPixel(img, 2, 63-22, &tmp); - RDrawLine(img, 63-22, 0, 63-22, 1, &tmp); - - RDrawLine(img, 2, 63-21, 21, 63-2, &color); /* lower 2 black lines */ - ROperateLine(img, RSubtractOperation, 2, 63-20, 20, 63-2, &cdelta1); /* the bevel arround them */ - ROperateLine(img, RAddOperation, 2, 63-22, 22, 63-2, &cdelta); - RDrawLine(img, 21, 63-1, 21, 63, &color); /* lower small black lines */ - RDrawLine(img, 0, 63-21, 1, 63-21, &color); - ROperateLine(img, RAddOperation, 22, 63-1, 22, 63, &cdelta); - /*ROperateLine(img, RAddOperation, 22, 63-1, 22, 63, &cdelta);*/ /* the bevel arround them */ - ROperateLine(img, RSubtractOperation, 0, 63-22, 1, 63-22, &cdelta1); -#endif - - RConvertImage(ctx, img, &pix); - XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 0, 0); - RReleaseImage(img); - - XSetWindowBackgroundPixmap(dpy, win, back); - XMapRaised(dpy, win); - XClearWindow(dpy, win); - XFlush(dpy); -} - - - -void -benchmark() -{ - RImage *img; - RColor color; - RColor cdelta; - double t1, t2, total, d1=0, d2=0, d3=0; - struct timeval timev; - int i, j; - - puts("Starting benchmark"); - - gettimeofday(&timev, NULL); - t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - - img = RCreateImage(1024, 768, True); - - gettimeofday(&timev, NULL); - t2 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - total = t2 - t1; - printf("Image created in %f sec\n", total); - - gettimeofday(&timev, NULL); - t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - - color.red = 0x28; - color.green = 0x45; - color.blue = 0x69; - color.alpha = 0xff; - RClearImage(img, &color); - - color.red = 0xff; - color.green = 0x7d; - color.blue = 0x52; - color.alpha = 0xff; - cdelta.red = cdelta.green = cdelta.blue = 80; - cdelta.alpha = 0; - - gettimeofday(&timev, NULL); - t2 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - total = t2 - t1; - printf("Image filled in %f sec\n", total); - - for(j=1; j<6; j++) { - printf("Pass %d...\n", j); - gettimeofday(&timev, NULL); - t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - - color.alpha = 0xff; - for (i=0; i< 10000; i++) { - RDrawLine(img, 0, i%64, i%64, 63, &color); - } - - gettimeofday(&timev, NULL); - t2 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - total = t2 - t1; - printf("Drawing 10000 lines in %f sec\n", total); - d1 += total; - - gettimeofday(&timev, NULL); - t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - - color.alpha = 80; - for (i=0; i< 10000; i++) { - RDrawLine(img, 0, i%64, i%64, 63, &color); - } - - gettimeofday(&timev, NULL); - t2 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - total = t2 - t1; - printf("Drawing 10000 lines with alpha in %f sec\n", total); - d2+=total; - - gettimeofday(&timev, NULL); - t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - - for (i=0; i< 10000; i++) { - ROperateLine(img, RAddOperation, 0, i%64, i%64, 63, &cdelta); - } - - gettimeofday(&timev, NULL); - t2 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - total = t2 - t1; - printf("Altering 10000 lines in %f sec\n", total); - d3+=total; - } - printf("Average: %f, %f, %f\n", d1/5, d2/5, d3/5); - - RReleaseImage(img); -} - - -int main(int argc, char **argv) -{ - RContextAttributes attr; - int visualID = -1; - - ProgName = strrchr(argv[0],'/'); - if (!ProgName) - ProgName = argv[0]; - else - ProgName++; - - dpy = XOpenDisplay(""); - if (!dpy) { - puts("cant open display"); - exit(1); - } - - attr.flags = RC_RenderMode | RC_ColorsPerChannel; - - attr.render_mode = RDitheredRendering; - attr.colors_per_channel = 4; - - if (visualID >= 0) { - attr.flags |= RC_VisualID; - attr.visualid = visualID; - } - - ctx = RCreateContext(dpy, DefaultScreen(dpy), &attr); - - if (!ctx) { - printf("could not initialize graphics library context: %s\n", - RMessageForError(RErrorCode)); - exit(1); - } - - /* Here are the things we want to test */ - testDraw(); - - testBevel(); - - drawClip(); - - testScale(); - - testRotate(); - - /* benchmark();*/ - - getchar(); - return 0; -} - diff -Naur WindowMaker-0.91.0/wrlib/testgrad.c wm/wrlib/testgrad.c --- WindowMaker-0.91.0/wrlib/testgrad.c 2004-10-12 22:23:28 +0400 +++ wm/wrlib/testgrad.c 1970-01-01 03:00:00 +0300 @@ -1,213 +0,0 @@ - - -#include -#include "wraster.h" -#include -#include -#include -#ifdef BENCH -#include -#include -#endif - - -Display *dpy; -Window win; -RContext *ctx; -RImage *imgh, *imgv, *imgd; -Pixmap pix; -char *ProgName; - - -void -print_help() -{ - printf("usage: %s [-options] color1 [color2 ...]\n", ProgName); - puts("options:"); - puts(" -m match colors"); - puts(" -d dither colors (default)"); - puts(" -c colors per channel to use"); - puts(" -v visual id to use"); -} - -#ifdef BENCH -#include "bench.h" -#endif -int main(int argc, char **argv) -{ - RContextAttributes attr; - RColor **colors = NULL; - int i, rmode = RDitheredRendering, ncolors = 0, cpc = 4; - char **color_name; - XColor color; - XSetWindowAttributes val; - int visualID = -1; -#ifdef BENCH - double t1, t2, total, t, rt; - struct timeval timev; -#endif - - ProgName = strrchr(argv[0],'/'); - if (!ProgName) - ProgName = argv[0]; - else - ProgName++; - - color_name = (char **) malloc(sizeof(char*) * argc); - if(color_name == NULL) { - fprintf(stderr, "Cannot allocate memory!\n"); - exit(1); - } - - if (argc>1) { - for (i=1; i=argc) { - fprintf(stderr, "too few arguments for %s\n", argv[i-1]); - exit(0); - } - if (sscanf(argv[i], "%i", &cpc)!=1) { - fprintf(stderr, "bad value for colors per channel: \"%s\"\n", argv[i]); - exit(0); - } - } else if (strcmp(argv[i], "-v")==0) { - i++; - if (i>=argc) { - fprintf(stderr, "too few arguments for %s\n", argv[i-1]); - exit(0); - } - if (sscanf(argv[i], "%i", &visualID)!=1) { - fprintf(stderr, "bad value for visual ID: \"%s\"\n", argv[i]); - exit(0); - } - } else if (argv[i][0] != '-') { - color_name[ncolors++] = argv[i]; - } else { - print_help(); - exit(1); - } - } - } - - if (ncolors == 0) { - print_help(); - exit(1); - } - - dpy = XOpenDisplay(""); - if (!dpy) { - puts("cant open display"); - exit(1); - } - attr.flags = RC_RenderMode | RC_ColorsPerChannel; - - attr.render_mode = rmode; - attr.colors_per_channel = cpc; - - if (visualID >= 0) { - attr.flags |= RC_VisualID; - attr.visualid = visualID; - } - - ctx = RCreateContext(dpy, DefaultScreen(dpy), &attr); - - if (!ctx) { - printf("could not initialize graphics library context: %s\n", - RMessageForError(RErrorCode)); - exit(1); - } - - colors = malloc(sizeof(RColor*)*(ncolors+1)); - for (i=0; icmap, color_name[i], &color)) { - printf("could not parse color \"%s\"\n", color_name[i]); - exit(1); - } - else { - colors[i] = malloc(sizeof(RColor)); - colors[i]->red = color.red >> 8; - colors[i]->green = color.green >> 8; - colors[i]->blue = color.blue >> 8; - printf("0x%02x%02x%02x\n", colors[i]->red, colors[i]->green, - colors[i]->blue); - } - } - colors[i] = NULL; - - val.background_pixel = ctx->black; - val.colormap = ctx->cmap; - val.backing_store = Always; -#ifdef BENCH - win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, 250, 250, - 0, ctx->depth, InputOutput, ctx->visual, - CWColormap|CWBackPixel|CWBackingStore, &val); -#else - win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, 750, 250, - 0, ctx->depth, InputOutput, ctx->visual, - CWColormap|CWBackPixel|CWBackingStore, &val); -#endif - XMapRaised(dpy, win); - XFlush(dpy); - -#ifdef BENCH - rt = 0; - gettimeofday(&timev, NULL); - t = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - for (i=0; i<9; i++) { - if (i>0) - printf("\nrepeating...\n\n"); - gettimeofday(&timev, NULL); - t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - if (i%3==0) - imgh = RRenderMultiGradient(550, 550, colors, RGRD_HORIZONTAL); - else if (i%3==1) - imgh = RRenderMultiGradient(550, 550, colors, RGRD_VERTICAL); - else - imgh = RRenderMultiGradient(550, 550, colors, RGRD_DIAGONAL); - - gettimeofday(&timev, NULL); - t2 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - total = t2 - t1; - printf("gradient rendered in %f sec\n", total); - - RConvertImage(ctx, imgh, &pix); - gettimeofday(&timev, NULL); - t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - total = t1 - t2; - rt += total; - printf("image converted in %f sec\n", total); - - XCopyArea(dpy, pix, win, ctx->copy_gc, 0, 0, 250, 250, 0, 0); - - XFlush(dpy); - } - t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); - printf("------------------------------------------\n"); - printf("%i images processed in %f sec\n", i, t1-t); - printf("average time per convertion %f sec\n", rt/i); - printf("------------------------------------------\n"); -#else - imgh = RRenderMultiGradient(250, 250, colors, RGRD_HORIZONTAL); - imgv = RRenderMultiGradient(250, 250, colors, RGRD_VERTICAL); - imgd = RRenderMultiGradient(250, 250, colors, RGRD_DIAGONAL); - RConvertImage(ctx, imgh, &pix); - XCopyArea(dpy, pix, win, ctx->copy_gc, 0, 0, 250, 250, 0, 0); - - RConvertImage(ctx, imgv, &pix); - XCopyArea(dpy, pix, win, ctx->copy_gc, 0, 0, 250, 250, 250, 0); - - RConvertImage(ctx, imgd, &pix); - XCopyArea(dpy, pix, win, ctx->copy_gc, 0, 0, 250, 250, 500, 0); - - XFlush(dpy); -#endif - - getchar(); - return 0; -} - diff -Naur WindowMaker-0.91.0/wrlib/test.png wm/wrlib/test.png --- WindowMaker-0.91.0/wrlib/test.png 1998-09-30 02:36:30 +0400 +++ wm/wrlib/test.png 1970-01-01 03:00:00 +0300 @@ -1,13 +0,0 @@ -PNG - - IHDR #ꦷgAMA1_bKGD~# "IDATxݙ_luKrM.ZKʴRM Y.R2Z[Ɋ^qb,ZɊ (0PrB&\)(D~D4KK/9wUU4AΝ;ww|猕i -|ؘ}}+M!3߀ޱ&}߯ZfF5[,@f.3rZtL017qHÿto Z?TR4٢:O~-{D`kEU4")sZHfn2@6RtXO)ޯ;voR'zֽO۴=5ߣDOqD Oc3`co47e k$9SQ aȗ~U5`:OE5CJ :u'|VMt?\3%'*JS_7W&; 42@THtZ]m'Ի6tmrwK'Z׉^щ~QCbV b^NJ^Jr宁Z S _XfxNEOfͅz-/?ջu5Dp^vGVˏGW5| %˿\5ėf%XYhNf uSSn6Ys;;:p-'AW:UGpxqB?7GsZ g`/f@%6mW#r?zf7k.{zzz _NF٪ At5Huta>4u-⋋=wTK\*< e7 M@x޶"&nܛ9f5|>IEtSqEUvvhƫ ^R\TjVz=XtodɎap~~ p}c ׍{3lvB}ކ|9:^TyJz5%WkFƫ%X go|h7#aL$7u)7ݬP?*>WU4^Y+/WZO?{1+^ |{ w - u'0oh5HM@3~ݸ7sf7k.7e-/NK?RxZ s'@/eAY@ [?p| HQtu yfKϼQ-ѪHM@3~ݸ7sf7k.ԇ _|IV?4ħځN,'[3kXf|>o$_NY%an }MEFj0&fqo攛n\~|[~|!~ݻj%VyN&#āHFq@ ҊU;2t`@2zKoT۵3=-nj7#aL$7Vlvkeݻμ K@pR (#8grRKX4L;V݌14׍{3\67aZi.3o~`i޻ {pi 3 -=)opQqdv%)3{>5XaXiH4ь̤+[h7#aL$׀fiZV!_ -Cɽ?x~;w1[o zDE3ؓI~]Rl~%yZ+1S5ISZj݈VF˜H.~xVv: N]mx⁍/43}Ȉ c'ݛ l/Ib*aS1Q&1%?3j݈VD\9߭;wR'3j=K3Y ҕx{vi 1\[SΦx>lOcJF ޒ4ŨuWGjO9hn$83*}}§Rw~;@4k7syv|aE%aL>  j0&3gƫˁȽ_BAqޓ=vA&folnon4|6jd.dndoGq?eí۵IENDB` \ diff -Naur WindowMaker-0.91.0/wrlib/testrot.c wm/wrlib/testrot.c --- WindowMaker-0.91.0/wrlib/testrot.c 2004-10-12 22:23:33 +0400 +++ wm/wrlib/testrot.c 1970-01-01 03:00:00 +0300 @@ -1,70 +0,0 @@ - - -#include -#include "wraster.h" -#include -#include -#include -#include "tile.xpm" -Display *dpy; -Window win; -RContext *ctx; -RImage *img; -Pixmap pix; - - -#define MAX(a,b) (a)>(b) ? (a) : (b) - -int main(int argc, char **argv) -{ - RContextAttributes attr; - float a; - - dpy = XOpenDisplay(""); - if (!dpy) { - puts("cant open display"); - exit(1); - } - - attr.flags = RC_RenderMode | RC_ColorsPerChannel; - attr.render_mode = RDitheredRendering; - attr.colors_per_channel = 4; - ctx = RCreateContext(dpy, DefaultScreen(dpy), &attr); - - if (argc<2) - img = RGetImageFromXPMData(ctx, image_name); - else - img = RLoadImage(ctx, argv[1], 0); - - if (!img) { - puts(RMessageForError(RErrorCode)); - exit(1); - } - win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10, 10, - MAX(img->width, img->height), - MAX(img->height, img->width), 0, 0, 0); - XMapRaised(dpy, win); - XFlush(dpy); - - a = 0; - while (1) { - RImage *tmp; - - a = a + 1.0; - - tmp = RRotateImage(img, a); - if (!RConvertImage(ctx, tmp, &pix)) { - puts(RMessageForError(RErrorCode)); - exit(1); - } - RReleaseImage(tmp); - - XSetWindowBackgroundPixmap(dpy, win, pix); - XFreePixmap(dpy, pix); - XClearWindow(dpy, win); - XSync(dpy, 0); - usleep(50000); - } - exit(0); -} - diff -Naur WindowMaker-0.91.0/wrlib/tests/ballot_box.xpm wm/wrlib/tests/ballot_box.xpm --- WindowMaker-0.91.0/wrlib/tests/ballot_box.xpm 1970-01-01 03:00:00 +0300 +++ wm/wrlib/tests/ballot_box.xpm 2005-01-06 18:48:42 +0300 @@ -0,0 +1,906 @@ +/* XPM */ +static char * ballot_box_xpm[] = { +"48 48 855 2", +" c None", +". c #B8B8B8", +"+ c #A0A0A0", +"@ c #4A2511", +"# c #A7A7A7", +"$ c #EDEDED", +"% c #EBE8E7", +"& c #A6948D", +"* c #904B22", +"= c #B4622D", +"- c #9F5427", +"; c #87431F", +"> c #4B2410", +", c #BFBFBF", +"' c #464646", +") c #818181", +"! c #D4D4D4", +"~ c #FEFEFE", +"{ c #E79860", +"] c #E38848", +"^ c #F4E2D5", +"/ c #F0E7E2", +"( c #C1804A", +"_ c #9B562B", +": c #7D3E1C", +"< c #8A8A8A", +"[ c #ECDEDF", +"} c #B68183", +"| c #E2E2E2", +"1 c #6A6A6A", +"2 c #686868", +"3 c #C6C6C6", +"4 c #F7F7F7", +"5 c #F5D6C1", +"6 c #E7C9B3", +"7 c #D1D1D1", +"8 c #FBFBFB", +"9 c #E7A966", +"0 c #E7AC69", +"a c #D79A5D", +"b c #B77642", +"c c #9B562C", +"d c #743819", +"e c #3E1C0C", +"f c #717171", +"g c #B4B4B4", +"h c #C1A7A8", +"i c #B37F80", +"j c #BC8E90", +"k c #797979", +"l c #343434", +"m c #E0E0E0", +"n c #DABFC0", +"o c #924345", +"p c #E3CFCF", +"q c #A46264", +"r c #D1B0B1", +"s c #91857C", +"t c #ABABAB", +"u c #EADBCA", +"v c #C98D54", +"w c #E7AA67", +"x c #E8AC69", +"y c #E8AD6B", +"z c #EAAF6C", +"A c #D99E61", +"B c #AD6E3E", +"C c #884723", +"D c #663015", +"E c #503C33", +"F c #565656", +"G c #7E7878", +"H c #978383", +"I c #E8E8E8", +"J c #DBDBDB", +"K c #5F5F5F", +"L c #444444", +"M c #343130", +"N c #EEEEEE", +"O c #BF9192", +"P c #C8A0A1", +"Q c #9B5254", +"R c #DDDDDD", +"S c #BDBDBD", +"T c #646464", +"U c #CEC3BA", +"V c #8D5730", +"W c #E6A865", +"X c #E2A466", +"Y c #EAB270", +"Z c #ECB472", +"` c #BC8450", +" . c #9A5C32", +".. c #763E20", +"+. c #4F3120", +"@. c #3A312C", +"#. c #5D5D5D", +"$. c #999999", +"%. c #2C2C2C", +"&. c #834D28", +"*. c #3D3834", +"=. c #C0C0C0", +"-. c #E1E1E1", +";. c #414141", +">. c #BBBBBB", +",. c #3B1407", +"'. c #2F2113", +"). c #764A2A", +"!. c #DFA061", +"~. c #E8AC6A", +"{. c #E9AE6B", +"]. c #EAB06D", +"^. c #EBB270", +"/. c #EDB673", +"(. c #D9A368", +"_. c #B17848", +":. c #8A4B27", +"<. c #470C06", +"[. c #4B220E", +"}. c #9D562A", +"|. c #CB7F43", +"1. c #D98D4C", +"2. c #AF7B4F", +"3. c #4F4F4F", +"4. c #D3C0C0", +"5. c #AB7D7E", +"6. c #C7C7C7", +"7. c #989898", +"8. c #535353", +"9. c #201714", +"0. c #8E8E8E", +"a. c #413531", +"b. c #B07042", +"c. c #E7AB68", +"d. c #EAB77D", +"e. c #ECB87E", +"f. c #EAB06E", +"g. c #EDB674", +"h. c #EEB877", +"i. c #F2C17E", +"j. c #D0B17B", +"k. c #693E29", +"l. c #34160A", +"m. c #854520", +"n. c #BB6F38", +"o. c #DC965F", +"p. c #E4AE81", +"q. c #F4E1D1", +"r. c #C4C4C4", +"s. c #333333", +"t. c #929292", +"u. c #DACDCD", +"v. c #A47071", +"w. c #7A7A7A", +"x. c #212121", +"y. c #252525", +"z. c #626262", +"A. c #CFD8D4", +"B. c #F4DABD", +"C. c #E9AF6C", +"D. c #EAB16F", +"E. c #EBB371", +"F. c #EDB875", +"G. c #F8D693", +"H. c #FCDD9A", +"I. c #E19151", +"J. c #3A1407", +"K. c #6B3316", +"L. c #B16532", +"M. c #D07F41", +"N. c #DC9A67", +"O. c #AEAEAE", +"P. c #9E9E9E", +"Q. c #9C9C9C", +"R. c #2F2F2F", +"S. c #8F8F8F", +"T. c #B0B0B0", +"U. c #9A9A9A", +"V. c #6D6D6D", +"W. c #363636", +"X. c #0F0F0F", +"Y. c #2D2D2D", +"Z. c #757575", +"`. c #A9ACAA", +" + c #91A59C", +".+ c #C0CBC6", +"++ c #637F72", +"@+ c #F0CAA1", +"#+ c #EEBB78", +"$+ c #FADA98", +"%+ c #F8D18E", +"&+ c #E58D48", +"*+ c #CB6830", +"=+ c #502510", +"-+ c #9B5328", +";+ c #C9773B", +">+ c #D27F40", +",+ c #D38141", +"'+ c #D48344", +")+ c #BF8253", +"!+ c #85532C", +"~+ c #361A0C", +"{+ c #686260", +"]+ c #CFCFCF", +"^+ c #5A5A5A", +"/+ c #1A1A1A", +"(+ c #5E5E5E", +"_+ c #5C5C5C", +":+ c #3A3A3A", +"<+ c #0D0D0D", +"[+ c #3E3E3E", +"}+ c #828282", +"|+ c #C4C7C6", +"1+ c #DFE4E2", +"2+ c #15402C", +"3+ c #A1B2AA", +"4+ c #F6E2CD", +"5+ c #EBB882", +"6+ c #EFBE7C", +"7+ c #FCE09D", +"8+ c #F2BC79", +"9+ c #D77334", +"0+ c #DF7D3A", +"a+ c #E07E3B", +"b+ c #8B4821", +"c+ c #BF6C34", +"d+ c #CE7A3D", +"e+ c #D07C3E", +"f+ c #D17E3F", +"g+ c #CA7A3E", +"h+ c #864722", +"i+ c #511F0C", +"j+ c #491909", +"k+ c #4B2211", +"l+ c #6C6360", +"m+ c #323232", +"n+ c #131313", +"o+ c #191919", +"p+ c #393939", +"q+ c #C9C9C9", +"r+ c #728C80", +"s+ c #967568", +"t+ c #66331A", +"u+ c #E6A965", +"v+ c #F4CB88", +"w+ c #FEE4A1", +"x+ c #E89F5D", +"y+ c #DC7736", +"z+ c #DD7937", +"A+ c #DE7A37", +"B+ c #D77536", +"C+ c #AF5F2C", +"D+ c #E2813C", +"E+ c #D77C3B", +"F+ c #CD783C", +"G+ c #CF7A3D", +"H+ c #CA793D", +"I+ c #B06733", +"J+ c #B26835", +"K+ c #815636", +"L+ c #1D1715", +"M+ c #1B0D08", +"N+ c #706F6F", +"O+ c #939393", +"P+ c #050505", +"Q+ c #040404", +"R+ c #000000", +"S+ c #0D0401", +"T+ c #1F0A03", +"U+ c #444140", +"V+ c #F7E6D6", +"W+ c #7A492D", +"X+ c #A96F3F", +"Y+ c #E6A966", +"Z+ c #F8D491", +"`+ c #F9D593", +" @ c #DF8748", +".@ c #DA7434", +"+@ c #DB7635", +"@@ c #DB7736", +"#@ c #D47234", +"$@ c #793E24", +"%@ c #361F1A", +"&@ c #4D1C0A", +"*@ c #783919", +"=@ c #D87A38", +"-@ c #D77B3B", +";@ c #CD773B", +">@ c #D07D3E", +",@ c #D27E40", +"'@ c #D38041", +")@ c #D48243", +"!@ c #D7894A", +"~@ c #B28E5F", +"{@ c #2A261D", +"]@ c #030100", +"^@ c #222121", +"/@ c #171717", +"(@ c #1B0F0B", +"_@ c #441708", +":@ c #57240E", +"<@ c #4D4743", +"[@ c #FCF7F3", +"}@ c #E5AA70", +"|@ c #E2A05E", +"1@ c #E8AE6B", +"2@ c #FADC99", +"3@ c #F3C685", +"4@ c #D87638", +"5@ c #D77132", +"6@ c #D87233", +"7@ c #D97334", +"8@ c #BF642D", +"9@ c #4F1F0D", +"0@ c #3A3432", +"a@ c #555555", +"b@ c #C1C1C1", +"c@ c #120000", +"d@ c #411608", +"e@ c #4D1B09", +"f@ c #5C260F", +"g@ c #A85A28", +"h@ c #D77A3A", +"i@ c #CC763A", +"j@ c #CE793C", +"k@ c #CF7B3D", +"l@ c #D07D3F", +"m@ c #D78849", +"n@ c #FBDD9B", +"o@ c #5F553C", +"p@ c #1F1F1F", +"q@ c #7D5737", +"r@ c #D79154", +"s@ c #DD9352", +"t@ c #804724", +"u@ c #733F21", +"v@ c #E3A66E", +"w@ c #E19C5B", +"x@ c #ECB876", +"y@ c #EBAE6F", +"z@ c #D46B30", +"A@ c #D56C30", +"B@ c #D66E31", +"C@ c #D77032", +"D@ c #994B20", +"E@ c #46190A", +"F@ c #312825", +"G@ c #6C6C6C", +"H@ c #D2D2D2", +"I@ c #B68F90", +"J@ c #D7BDBE", +"K@ c #060200", +"L@ c #331106", +"M@ c #8B3712", +"N@ c #68270D", +"O@ c #59240E", +"P@ c #A35829", +"Q@ c #CF7B3E", +"R@ c #D17D3F", +"S@ c #F1C584", +"T@ c #7F7250", +"U@ c #0D0804", +"V@ c #5E3C20", +"W@ c #B57642", +"X@ c #DA8E4D", +"Y@ c #DB8F4F", +"Z@ c #DC9150", +"`@ c #804725", +" # c #D58F51", +".# c #E19D5C", +"+# c #F2C886", +"@# c #FBDC99", +"## c #DD8D51", +"$# c #D1682E", +"%# c #D2692E", +"&# c #D36B2F", +"*# c #CC672E", +"=# c #7D3918", +"-# c #4D1A09", +";# c #290E05", +"># c #321A11", +",# c #3B3B3B", +"'# c #3D3D3D", +")# c #1E0A03", +"!# c #903A13", +"~# c #873511", +"{# c #63250C", +"]# c #693015", +"^# c #AC5F2E", +"/# c #CD783B", +"(# c #D38142", +"_# c #DD9656", +":# c #D68647", +"<# c #D88848", +"[# c #D88A49", +"}# c #D98C4C", +"|# c #DC9151", +"1# c #DD9453", +"2# c #E29F5E", +"3# c #F8D592", +"4# c #F4CB8A", +"5# c #D67B41", +"6# c #CD642C", +"7# c #CF662D", +"8# c #D0672E", +"9# c #C15F2A", +"0# c #632810", +"a# c #7D3817", +"b# c #C4642C", +"c# c #873F1A", +"d# c #7C2B0F", +"e# c #8D401A", +"f# c #290801", +"g# c #803310", +"h# c #823311", +"i# c #5A210B", +"j# c #6A3015", +"k# c #BC6C35", +"l# c #D37F40", +"m# c #D58344", +"n# c #D58445", +"o# c #D88948", +"p# c #D88B4A", +"q# c #DA8F4E", +"r# c #DB904F", +"s# c #E4A665", +"t# c #FCDF9C", +"u# c #EAB274", +"v# c #CD6831", +"w# c #CB612A", +"x# c #CC632B", +"y# c #AD5324", +"z# c #511D0B", +"A# c #763013", +"B# c #CB642C", +"C# c #C9612B", +"D# c #AC4A1E", +"E# c #9D4F22", +"F# c #1B0500", +"G# c #180902", +"H# c #50200A", +"I# c #7E3110", +"J# c #7B3D1C", +"K# c #BE6E36", +"L# c #D58546", +"M# c #D78748", +"N# c #D88949", +"O# c #D98B4A", +"P# c #ECB977", +"Q# c #DE975C", +"R# c #C75D27", +"S# c #C85F28", +"T# c #CA6029", +"U# c #93421C", +"V# c #622911", +"W# c #943412", +"X# c #BE5825", +"Y# c #D56E31", +"Z# c #A55525", +"`# c #310802", +" $ c #240601", +".$ c #150500", +"+$ c #200C03", +"@$ c #702D0E", +"#$ c #752D0F", +"$$ c #511D0A", +"%$ c #82401D", +"&$ c #C8773B", +"*$ c #D68546", +"=$ c #FADB99", +"-$ c #D27C44", +";$ c #C55B25", +">$ c #C65C26", +",$ c #C05B26", +"'$ c #793315", +")$ c #060606", +"!$ c #2E2E2E", +"~$ c #EEE1DB", +"{$ c #F8EBE4", +"]$ c #D5723B", +"^$ c #A45425", +"/$ c #260D04", +"($ c #2C0F05", +"_$ c #0C0501", +":$ c #070402", +"<$ c #3C1807", +"[$ c #883611", +"}$ c #8D4B24", +"|$ c #CA783C", +"1$ c #D58444", +"2$ c #DD9757", +"3$ c #F6D290", +"4$ c #F2C989", +"5$ c #C55F2B", +"6$ c #C25824", +"7$ c #C35925", +"8$ c #AF4F21", +"9$ c #60250E", +"0$ c #1C0A04", +"a$ c #0A0A0A", +"b$ c #87595A", +"c$ c #F2D8C9", +"d$ c #D0672D", +"e$ c #A35224", +"f$ c #0D0200", +"g$ c #0F0501", +"h$ c #282828", +"i$ c #070707", +"j$ c #0D0501", +"k$ c #56220B", +"l$ c #6C290E", +"m$ c #9B5126", +"n$ c #E4A766", +"o$ c #FBDE9B", +"p$ c #E5AD71", +"q$ c #BE5322", +"r$ c #BF5523", +"s$ c #C15623", +"t$ c #9D451C", +"u$ c #4C1B0A", +"v$ c #100704", +"w$ c #3F2C2C", +"x$ c #AB9898", +"y$ c #EAE3E3", +"z$ c #F7EAE3", +"A$ c #CE662D", +"B$ c #A25123", +"C$ c #878787", +"D$ c #7F7F7F", +"E$ c #DFDFDF", +"F$ c #425F51", +"G$ c #3E4F47", +"H$ c #121212", +"I$ c #1F0C03", +"J$ c #58210D", +"K$ c #DEB67D", +"L$ c #D38750", +"M$ c #BB5020", +"N$ c #BC5221", +"O$ c #853816", +"P$ c #3F1507", +"Q$ c #0A0402", +"R$ c #0E0E0E", +"S$ c #616161", +"T$ c #B69C9D", +"U$ c #893336", +"V$ c #DB926C", +"W$ c #7C3617", +"X$ c #EAEDEB", +"Y$ c #ACB7B2", +"Z$ c #8E9994", +"`$ c #424E48", +" % c #595959", +".% c #130602", +"+% c #100601", +"@% c #401907", +"#% c #9F411D", +"$% c #B84D1E", +"%% c #B94F1F", +"&% c #B54E20", +"*% c #6D2B10", +"=% c #160702", +"-% c #554338", +";% c #787878", +">% c #382B24", +",% c #97481F", +"'% c #C55F29", +")% c #723114", +"!% c #230B02", +"~% c #302A28", +"{% c #C2C0BE", +"]% c #EEF1F0", +"^% c #A1AFA8", +"/% c #C4CAC7", +"(% c #585858", +"_% c #280D05", +":% c #361207", +"<% c #401708", +"[% c #280F04", +"}% c #551F09", +"|% c #9A3E18", +"1% c #B74C1D", +"2% c #A4451B", +"3% c #5E230D", +"4% c #742E12", +"5% c #963714", +"6% c #883111", +"7% c #77290E", +"8% c #983814", +"9% c #9A3814", +"0% c #91421B", +"a% c #C96029", +"b% c #C25C28", +"c% c #5E250E", +"d% c #1F0A02", +"e% c #0A0200", +"f% c #311205", +"g% c #B8A8A2", +"h% c #82998E", +"i% c #CECECE", +"j% c #140602", +"k% c #3F1608", +"l% c #712B0F", +"m% c #833311", +"n% c #57210B", +"o% c #170802", +"p% c #250C03", +"q% c #6B250C", +"r% c #993D17", +"s% c #B54A1D", +"t% c #A2421A", +"u% c #873615", +"v% c #9D411A", +"w% c #B95020", +"x% c #BB5121", +"y% c #A9441A", +"z% c #9C3A15", +"A% c #C05723", +"B% c #C45B25", +"C% c #C75C27", +"D% c #B05122", +"E% c #55200C", +"F% c #160701", +"G% c #9E8075", +"H% c #BEBEBE", +"I% c #371307", +"J% c #6A280D", +"K% c #813211", +"L% c #803111", +"M% c #7F3111", +"N% c #7E3011", +"O% c #762D0F", +"P% c #451A08", +"Q% c #360B03", +"R% c #7C240B", +"S% c #481808", +"T% c #983C17", +"U% c #782E11", +"V% c #B74D1E", +"W% c #BD5322", +"X% c #B44C1E", +"Y% c #B84F20", +"Z% c #C35924", +"`% c #C45A25", +" & c #AE4F20", +".& c #461909", +"+& c #130600", +"@& c #2D1105", +"#& c #66260D", +"$& c #703D2A", +"%& c #8F7165", +"&& c #6E341C", +"*& c #7D3010", +"=& c #7C3010", +"-& c #7B2F10", +";& c #7A2F10", +">& c #792E10", +",& c #782E10", +"'& c #6A280E", +")& c #2F1205", +"!& c #331206", +"~& c #541E0B", +"{& c #843313", +"]& c #AE451A", +"^& c #B1471B", +"/& c #BF5422", +"(& c #9C451C", +"_& c #867872", +":& c #A68574", +"<& c #3F1B0F", +"[& c #0C0300", +"}& c #2C1005", +"|& c #501D0A", +"1& c #772D10", +"2& c #752C0F", +"3& c #742C0F", +"4& c #6F2A0E", +"5& c #722B0F", +"6& c #511E0A", +"7& c #6E270E", +"8& c #A93F18", +"9& c #B0461B", +"0& c #B4491C", +"a& c #B54A1C", +"b& c #BC5121", +"c& c #9A431B", +"d& c #3B3431", +"e& c #E9E9E9", +"f& c #838181", +"g& c #260400", +"h& c #6B280E", +"i& c #732B0F", +"j& c #712A0F", +"k& c #702A0F", +"l& c #6F2A0F", +"m& c #6E290E", +"n& c #5C220C", +"o& c #3D1407", +"p& c #832F11", +"q& c #AD4419", +"r& c #AF451A", +"s& c #B2481B", +"t& c #B84E1F", +"u& c #8C3C18", +"v& c #CACACA", +"w& c #454545", +"x& c #371506", +"y& c #702A0E", +"z& c #6D290E", +"A& c #6C280E", +"B& c #6A270E", +"C& c #69270E", +"D& c #3E1507", +"E& c #8B3413", +"F& c #AE431A", +"G& c #B1461B", +"H& c #B5491C", +"I& c #893816", +"J& c #452B1F", +"K& c #A3A3A3", +"L& c #DEDEE1", +"M& c #E6E6E6", +"N& c #0F0000", +"O& c #090300", +"P& c #160801", +"Q& c #531F0A", +"R& c #461A09", +"S& c #545454", +"T& c #724C3D", +"U& c #68260E", +"V& c #67260D", +"W& c #66250D", +"X& c #65250D", +"Y& c #3D1507", +"Z& c #863213", +"`& c #AC4119", +" * c #B0461A", +".* c #863514", +"+* c #53382D", +"@* c #959595", +"#* c #C6C6C9", +"$* c #4D4F60", +"%* c #7F808D", +"&* c #404154", +"** c #CECED3", +"=* c #BEBFC5", +"-* c #040100", +";* c #0E0500", +">* c #270E04", +",* c #382F2C", +"'* c #6B4638", +")* c #64250D", +"!* c #63240D", +"~* c #62230D", +"{* c #401608", +"]* c #722A0F", +"^* c #AB4018", +"/* c #AD421A", +"(* c #AF441A", +"_* c #7E3B20", +":* c #D3D1D1", +"<* c #ECECEC", +"[* c #5F6170", +"}* c #EEEEEF", +"|* c #303246", +"1* c #969696", +"2* c #CCCCCC", +"3* c #5B3324", +"4* c #61230C", +"5* c #60230C", +"6* c #5F230C", +"7* c #5E220C", +"8* c #70290F", +"9* c #AA3F18", +"0* c #973916", +"a* c #301006", +"b* c #312117", +"c* c #31302F", +"d* c #CDCDCD", +"e* c #8F909B", +"f* c #1E1E1E", +"g* c #D2D2D1", +"h* c #696969", +"i* c #583224", +"j* c #5E220B", +"k* c #5D220B", +"l* c #5C210B", +"m* c #6E280F", +"n* c #A83E17", +"o* c #A43E18", +"p* c #561E0C", +"q* c #2B0E05", +"r* c #505162", +"s* c #9F9FA9", +"t* c #BCBDC3", +"u* c #D6D6D6", +"v* c #9D9D9D", +"w* c #737373", +"x* c #694F45", +"y* c #5B200B", +"z* c #5A200B", +"A* c #591F0B", +"B* c #581F0A", +"C* c #381306", +"D* c #6D270E", +"E* c #A63D17", +"F* c #993915", +"G* c #240500", +"H* c #AEAFB7", +"I* c #F0F0F0", +"J* c #575757", +"K* c #CCCCD1", +"L* c #D8D7D7", +"M* c #A49590", +"N* c #561E0A", +"O* c #551D0A", +"P* c #351206", +"Q* c #6B260E", +"R* c #A53C16", +"S* c #903514", +"T* c #8E8E96", +"U* c #9B9BA0", +"V* c #F5F5F5", +"W* c #342721", +"X* c #290E04", +"Y* c #4F1B09", +"Z* c #521C0A", +"`* c #511C09", +" = c #69250D", +".= c #A33B15", +"+= c #822F11", +"@= c #1D0200", +"#= c #838383", +"$= c #6F707E", +"%= c #030000", +"&= c #0B0400", +"*= c #140701", +"== c #3B1406", +"-= c #4E1A09", +";= c #311005", +">= c #68240C", +",= c #802D10", +"'= c #050100", +")= c #919191", +"!= c #010000", +"~= c #0A0300", +"{= c #1D0A02", +"]= c #270D04", +"^= c #351005", +"/= c #100000", +"(= c #111111", +"_= c #0E0501", +":= c #0E0400", +"<= c #070000", +"[= c #909090", +" ", +" . + @ ", +" # $ % & * = - ; > , # ' ", +" ) ! ~ ~ ~ ~ { ] ^ / ( _ : > < [ } | + 1 1 ' ' ", +" 2 3 4 ~ ~ ~ ~ ~ 5 6 7 8 9 0 a b c d e f g h i j ~ ~ 4 3 k ", +" l m ~ n o p q r ~ 4 s t u v w x y z A B C D E F G H 7 I J K L ", +" M N O P Q [ ~ I R S T U V W w x y X Y Z ` ...+.@.#.$.%. ", +" D &.*.N p r ~ I J =.-.;.>.,.'.).!.~.{.].^.Z /.(._.:...<. ", +" [.}.|.1.2.3.~ [ 4.5.7 6.7.8.f 9.0.a.b.c.d.e.f.^.Z g.h.i.j.k. ", +" l.m.n.o.p.q.r.s.t.u.v.R S w.L x.y.z.! ~ ~ A.~ B.C.D.E.F.G.H.I.J. ", +" K.L.M.N.O.P.N 4 Q.R.S.T.U.V.W.X.Y.Z.`. +.+++ +~ @+y z #+$+%+&+*+J. ", +" =+-+;+>+,+'+)+!+~+{+]+^+/+(+_+:+<+[+}+|+++1+2+3+4+5+w x 6+7+8+9+0+a+J. ", +" l.b+c+d+e+f+>+g+h+i+j+k+l+r.m+n+l o+p+(+q+~ ~ r+A.s+j+t+u+v+w+x+y+z+A+B+J. ", +" K.C+D+E+F+G+e+f+H+I+J+K+L+M+N+O+P+Q+X.R+S+T+U+N ~ V+W+X+Y+Z+`+ @.@+@@@#@$@%@ ' ' ' ", +" &@*@=@D+-@;@F+G+>@,@'@)@!@~@{@]@^@/@Q+R+(@_@j+:@<@[@}@|@1@2@3@4@5@6@7@8@9@0@a@b@| | t.", +" c@d@e@f@g@h@i@;@j@k@l@,@'@m@n@o@R+]@p@X.q@r@s@t@j+u@v@w@x@w+y@z@A@B@C@D@E@F@G@H@I@J@| ' ", +" K@L@M@N@j+O@P@i@;@j@Q@R@,@'@m@S@T@U@V@W@X@Y@Z@s@`@ #.#+#@###$#%#&#*#=#-#;#>#F ,#'#R+x. ", +" K@)#!#!#~#{#j+]#^#/#j@e+f+>+(#'+_#:#<#[#}#X@Y@|#1#2#3#4#5#6#7#8#9#0#a#b#c#d#e#L@ ", +" K@f#g#!#!#!#h#i#j+j#k#d+e+f+l#(#m#n#:#o#p#1.q#r#s#t#u#v#w#x#6#y#z#A#B#C#B@D#E#J. ", +" c@F#G#H#!#!#!#!#I#i#j+J#K#e+f+'@)@m#L#M#N#O#1.P#w+Q#R#S#T#w#U#,.V#W#X#&#A@Y#Z#J. ", +" `# $.$+$@$!#!#!#!##$$$j+%$&$,@'@)@m#*$M#q#+#=$-$;$>$R#,$'$;#)$!$~${$]$&#A@^$J. ", +" `#/$($_$:$<$[$!#!#!#!##$$$i+}$|$'@)@1$2$3$4$5$6$7$;$8$9$0$a$W.b$N c$d$%#&#e$J. ", +" f$g$_+#.h$i$j$k$!#!#!#!#M@l$e@i+m$R@n$o$p$q$r$s$6$t$u$v$X.w$x$y$z$6#A$d$%#B$J. ", +" C$D$0.N E$F$G$p+n+H$I$@$!#!#!#!#M@l$j+J$K$L$M$N$q$r$O$P$Q$R$S$T$U$~ V$x#6#A$d$W$($ ", +" k . 4 ~ X$Y$Z$`$ %L .%+%@%[$!#!#!#!#~#j+#%$%%%M$&%*%P$=%,.-%F ;%D$>%,%w#x#'%)%!% ", +" ~%{%]%++^%/%(%_%:%<%[%G#}%!#!#!#!#j+|%1%$%2%3%4%5%6%7%W#8%9%0%R#S#a%b%c%d% ", +" e%f%g%~ h%i%j%:%k%l%m%n%o%p%q%!#!#j+r%s%t%u%v%M$w%x%y%8%z%A%B%>$C%D%E%F% ", +" e%/$:%G%1+H%I%J%K%L%M%N%O%P%+%Q%R%S%T%U%U%1%V%%%M$N$W%X%Y%6$Z%`% &.&+& ", +" K@@&#&J.$&%&&&N%*&=&-&;&>&,&'&)&.$!&~&{&]&^&1%V%%%M$N$W%/&(&_&:&<&[& ", +" K@}&M%l%|&|&#&;&>&,&1&O%2&3&4&5&6&L@7&8&9&0&a&1%V%%%M$b&c&d&T.e&f&' ", +" g&-&;&>&3&h&O%2&3&i&5&j&k&l&m&n&o&p&q&r&s&0&a&1%V%t&u&d&# E$~ R v&< S$w& ", +" +%x&y&2&3&i&h&j&k&l&m&z&A&h&B&C&D&E&F&r&G&s&0&H&I&J&p+K&-.8 L&~ ~ ~ M&| 3 . $.1 ", +" N&O&P&Q&k&R&S&T&A&h&B&C&U&V&W&X&Y&Z&`&F&r& *.*+*S&@*q+#*$*%*&***=*~ ~ ~ ~ ~ ~ S. ", +" R+R+-*;*>*,*@*}+'*V&W&X&)*!*!*~*{*]*^*`&/*(*_*m+. :*<*[*%*&*=*&*L&}*|*~ ~ ~ ! ", +" R+R+R+f$1*2*O+Z.3*!*~*4*5*6*7*Y&8*9*^*`&0*:%a*b*c*d*=*e*=*&*}*}*&***~ ~ 4 f ", +" R+R+f*8 g*2*7.h*i*7*j*k*l*l*J.m*n*9*^*o*p*q*[&R+R+D$~ r*}*~ [*s*~ ~ ~ , ", +" R+f*i%L&t*-.u*v*w*x*y*z*A*B*C*D*E*n*9*F*_@G*R+R+R+R+!$i%~ e*e*H*~ ~ I*J* ", +" R+R+R+R$3.0.~ ~ }*&*K*-.u*L*M*-#N*O*O*P*Q*R*E*S*_@[& R+R+R+R+D$~ %*s*~ 4 $. ", +" l | ~ ~ ~ ~ ~ ~ T*%*L&&*U*-.V*W*X*Y*Z*`*L@ =.=+=J.@= R+R+R+!$i%~ e&$. ", +" i$#=I*~ e***~ =***=*[*H*$=8 K&%=&=*===-=;=>=,=L@'= R+R+R$)=w. ", +" R+o+$.4 }*$=s*L&&*[*s*s*~ ! l R+R+!=~={=]=C*^=/= R+R+(= ", +" R+R+l # $ ~ s*$=L&s*L&~ e&K R+R+R+R+_=:=<= ", +" R+R+s.[=e&~ **e*~ ~ | ) R+R+R+ ", +" R+R+i$3.! ~ d*4 , ' ", +" R+R+s.# J ) o+ ", +" R+R+X.'# ", +" ", +" "}; diff -Naur WindowMaker-0.91.0/wrlib/tests/CVS/Entries wm/wrlib/tests/CVS/Entries --- WindowMaker-0.91.0/wrlib/tests/CVS/Entries 1970-01-01 03:00:00 +0300 +++ wm/wrlib/tests/CVS/Entries 2005-05-17 22:43:33 +0400 @@ -0,0 +1,10 @@ +/.cvsignore/1.1/Thu Jan 6 15:48:42 2005// +/Makefile.am/1.3/Wed Mar 2 10:59:40 2005// +/ballot_box.xpm/1.1/Thu Jan 6 15:48:42 2005/-kb/ +/test.png/1.1/Thu Jan 6 15:48:42 2005/-kb/ +/testdraw.c/1.1/Thu Jan 6 15:48:42 2005// +/testgrad.c/1.1/Thu Jan 6 15:48:42 2005// +/testrot.c/1.1/Thu Jan 6 15:48:42 2005// +/tile.xpm/1.1/Thu Jan 6 15:48:42 2005/-kb/ +/view.c/1.1/Thu Jan 6 15:48:42 2005// +D diff -Naur WindowMaker-0.91.0/wrlib/tests/CVS/Repository wm/wrlib/tests/CVS/Repository --- WindowMaker-0.91.0/wrlib/tests/CVS/Repository 1970-01-01 03:00:00 +0300 +++ wm/wrlib/tests/CVS/Repository 2005-05-17 22:43:32 +0400 @@ -0,0 +1 @@ +wm/wrlib/tests diff -Naur WindowMaker-0.91.0/wrlib/tests/CVS/Root wm/wrlib/tests/CVS/Root --- WindowMaker-0.91.0/wrlib/tests/CVS/Root 1970-01-01 03:00:00 +0300 +++ wm/wrlib/tests/CVS/Root 2005-05-17 22:43:32 +0400 @@ -0,0 +1 @@ +:pserver:anoncvs@cvs.windowmaker.org:/cvsroot diff -Naur WindowMaker-0.91.0/wrlib/tests/.cvsignore wm/wrlib/tests/.cvsignore --- WindowMaker-0.91.0/wrlib/tests/.cvsignore 1970-01-01 03:00:00 +0300 +++ wm/wrlib/tests/.cvsignore 2005-01-06 18:48:42 +0300 @@ -0,0 +1,4 @@ +Makefile Makefile.in +view testgrad testdraw testrot +.libs *.pc +.psrc .inslog2 tca.map tca.log pchdir *.rpt diff -Naur WindowMaker-0.91.0/wrlib/tests/Makefile.am wm/wrlib/tests/Makefile.am --- WindowMaker-0.91.0/wrlib/tests/Makefile.am 1970-01-01 03:00:00 +0300 +++ wm/wrlib/tests/Makefile.am 2005-03-02 13:59:40 +0300 @@ -0,0 +1,24 @@ +## automake input file for wrlib + +AUTOMAKE_OPTIONS = no-dependencies + +noinst_PROGRAMS = testdraw testgrad testrot view + +EXTRA_DIST = test.png tile.xpm ballot_box.xpm + +INCLUDES = -I.. $(DFLAGS) @HEADER_SEARCH_PATH@ + +LIBLIST = $(top_builddir)/wrlib/libwraster.la + +testdraw_SOURCES = testdraw.c +testdraw_LDADD = $(LIBLIST) + +testgrad_SOURCES = testgrad.c +testgrad_LDADD = $(LIBLIST) + +testrot_SOURCES = testrot.c +testrot_LDADD = $(LIBLIST) + +view_SOURCES= view.c +view_LDADD = $(LIBLIST) + diff -Naur WindowMaker-0.91.0/wrlib/tests/testdraw.c wm/wrlib/tests/testdraw.c --- WindowMaker-0.91.0/wrlib/tests/testdraw.c 1970-01-01 03:00:00 +0300 +++ wm/wrlib/tests/testdraw.c 2005-01-06 18:48:42 +0300 @@ -0,0 +1,634 @@ + +#include +#include "wraster.h" +#include +#include +#include + +#include +#include + + +Display *dpy; +RContext *ctx; +char *ProgName; + + +void +testDraw() +{ + RImage *img, *tile, *icon, *tmp; + RColor color, from, to; + RColor cdelta; + RSegment segs[20]; + int i, x, y; + XSetWindowAttributes val; + Pixmap pix, back; + Window win; + + val.background_pixel = ctx->black; + val.colormap = ctx->cmap; + win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, 128, 256, + 0, ctx->depth, InputOutput, ctx->visual, + CWColormap|CWBackPixel, &val); + back = XCreatePixmap(ctx->dpy, ctx->drawable, 128, 256, ctx->depth); + + /* Dark blue tile gradient */ + from.red = 0x28; + from.green = 0x45; + from.blue = 0x69; + from.alpha = 0xff; + to.red = 0x08; + to.green = 0x24; + to.blue = 0x20; + to.alpha = 0xff; + + /* Standard gray tile gradient */ + /*from.red = 0xa6; + from.green = 0xa6; + from.blue = 0xb6; + from.alpha = 0xff; + to.red = 0x51; + to.green = 0x55; + to.blue = 0x61; + to.alpha = 0xff;*/ + + /* Make the tile, and put it as a sample in the first place */ + tile = RRenderGradient(64, 64, &from, &to, RGRD_DIAGONAL); + img = RCloneImage(tile); + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 0, 0); + + /* Read the image, and combine it with the tile. Put it as a sample + * in the second slot, and also save a copy for later use. */ + icon = RLoadImage(ctx, "ballot_box.xpm", 0); + if (!icon) { + puts(RMessageForError(RErrorCode)); + exit(1); + } + RCombineArea(img, icon, 0, 0, icon->width, icon->height, 8, 8); + RReleaseImage(icon); + tmp = img; + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 64, 0); + + img = RCloneImage(tile); + + /* Draw random pixels on image */ + for (i=0; i< 200; i++) { + color.red = rand()%256; + color.green = rand()%256; + color.blue = rand()%256; + color.alpha = 255; + x = rand()%64; + y = rand()%64; + RPutPixel(img, x, y, &color); + } + + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 0, 64); + + RReleaseImage(img); + img = RCloneImage(tile); + + /* Alter random pixels in image with the same amount for r/g/b */ + for (i=0; i< 200; i++) { + cdelta.red = cdelta.green = cdelta.blue = rand()%511 - 255; + cdelta.alpha = 0; + x = rand()%64; + y = rand()%64; + ROperatePixel(img, RAddOperation, x, y, &cdelta); + } + + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 64, 64); + + RReleaseImage(img); + img = RCloneImage(tile); + + /* Draw lines in all directions to test different slopes */ + color.red = 0xff; + color.green = 0x7d; + color.blue = 0x52; + color.alpha = 0xff; + for (i=0; i<16; i++) + segs[i].x1 = segs[i].y1 = 31; + + segs[6].x2 = segs[7].x2 = segs[8].x2 = segs[9].x2 = segs[10].x2 = 0; + segs[2].y2 = segs[3].y2 = segs[4].y2 = segs[5].y2 = segs[6].y2 = 0; + segs[5].x2 = segs[11].x2 = 16; + segs[1].y2 = segs[7].y2 = 16; + segs[4].x2 = segs[12].x2 = 31; + segs[0].y2 = segs[8].y2 = 31; + segs[3].x2 = segs[13].x2 = 46; + segs[9].y2 = segs[15].y2 = 46; + segs[0].x2 = segs[1].x2 = segs[2].x2 = segs[14].x2 = segs[15].x2 = 62; + segs[10].y2 = segs[11].y2 = segs[12].y2 = segs[13].y2 = segs[14].y2 = 62; + RDrawSegments(img, segs, 9, &color); + + /* Also test how alpha channel behaves when drawing lines */ + color.alpha = 0x80; + RDrawSegments(img, &segs[9], 7, &color); + + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 0, 128); + + RReleaseImage(img); + img = RCloneImage(tile); + + /* Alter lines in all directions (test different slopes) */ + cdelta.red = cdelta.green = cdelta.blue = 80; + cdelta.alpha = 0; + ROperateSegments(img, RAddOperation, segs, 16, &cdelta); + + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 64, 128); + + RReleaseImage(img); + + /* Create a bevel around the icon, and save it for a later use */ + img = tmp; + cdelta.red = cdelta.green = cdelta.blue = 80; + cdelta.alpha = 0; + ROperateLine(img, RAddOperation, 8, 8, 56, 8, &cdelta); + ROperateLine(img, RAddOperation, 8, 9, 8, 56, &cdelta); + cdelta.red = cdelta.green = cdelta.blue = 40; + cdelta.alpha = 0; + ROperateLine(img, RSubtractOperation, 8, 56, 56, 56, &cdelta); + ROperateLine(img, RSubtractOperation, 56, 8, 56, 55, &cdelta); + RReleaseImage(tile); + tmp = RCloneImage(img); + + /* Draw some solid lines over the icon */ + color.red = 0xff; + color.green = 0x7d; + color.blue = 0x52; + color.alpha = 0xff; + for (i=16; i<24; i++) { + RDrawLine(img, 9, i, 55, i, &color); + } + + /* Also try some lines with alpha over the icon */ + color.alpha = 0x80; + for (i=40; i<48; i++) { + RDrawLine(img, 9, i, 55, i, &color); + } + + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 0, 192); + + RReleaseImage(img); + + /* Restore the image with the icon, and alter some lines */ + img = tmp; + cdelta.red = cdelta.green = cdelta.blue = 80; + cdelta.alpha = 0; + for (i=16; i<24; i++) { + ROperateLine(img, RSubtractOperation, 9, i, 55, i, &cdelta); + } + cdelta.red = cdelta.green = cdelta.blue = 80; + for (i=40; i<48; i++) { + ROperateLine(img, RAddOperation, 9, i, 55, i, &cdelta); + } + + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 64, 192); + + + XSetWindowBackgroundPixmap(dpy, win, back); + XMapRaised(dpy, win); + XClearWindow(dpy, win); + XFlush(dpy); +} + + +void +testBevel() +{ + RImage *img, *tile; + RColor color, from, to; + XSetWindowAttributes val; + Pixmap pix, back; + Window win; + + val.background_pixel = ctx->black; + val.colormap = ctx->cmap; + win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, 140, 140, + 0, ctx->depth, InputOutput, ctx->visual, + CWColormap|CWBackPixel, &val); + back = XCreatePixmap(ctx->dpy, ctx->drawable, 140, 140, ctx->depth); + + /* Standard gray tile gradient */ + from.red = 0xa6; + from.green = 0xa6; + from.blue = 0xb6; + from.alpha = 0xff; + to.red = 0x51; + to.green = 0x55; + to.blue = 0x61; + to.alpha = 0xff; + + /* Dark blue tile gradient */ + /*from.red = 0x28; + from.green = 0x45; + from.blue = 0x69; + from.alpha = 0xff; + to.red = 0x08; + to.green = 0x24; + to.blue = 0x20; + to.alpha = 0xff;*/ + + /* Create Background */ + img = RCreateImage(140, 140, True); + color.red = 0x28; + color.green = 0x45; + color.blue = 0x69; + color.alpha = 0xff; + RClearImage(img, &color); + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 140, 140, 0, 0); + RReleaseImage(img); + + tile = RRenderGradient(64, 64, &from, &to, RGRD_DIAGONAL); + + img = RCloneImage(tile); + RBevelImage(img, RBEV_SUNKEN); + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 3, 3); + RReleaseImage(img); + + img = RCloneImage(tile); + RBevelImage(img, RBEV_RAISED); + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 73, 3); + RReleaseImage(img); + + img = RCloneImage(tile); + RBevelImage(img, RBEV_RAISED2); + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 3, 73); + RReleaseImage(img); + + img = RCloneImage(tile); + RBevelImage(img, RBEV_RAISED3); + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 73, 73); + RReleaseImage(img); + + XSetWindowBackgroundPixmap(dpy, win, back); + XMapRaised(dpy, win); + XClearWindow(dpy, win); + XFlush(dpy); +} + + +void testScale() +{ + RImage *image; + RImage *scaled; + XSetWindowAttributes val; + Pixmap pix; + Window win; + + val.background_pixel = ctx->black; + val.colormap = ctx->cmap; + win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, 140, 140, + 0, ctx->depth, InputOutput, ctx->visual, + CWColormap|CWBackPixel, &val); + XStoreName(dpy, win, "Scale"); + pix = XCreatePixmap(ctx->dpy, ctx->drawable, 140, 140, ctx->depth); + + image = RLoadImage(ctx, "ballot_box.xpm", 0); + if (!image) { + puts("couldnt load ballot_box.xpm"); + return; + } + + scaled = RScaleImage(image, 140, 140); + + RReleaseImage(image); + RConvertImage(ctx, scaled, &pix); + XSetWindowBackgroundPixmap(dpy, win, pix); + XMapRaised(dpy, win); + XClearWindow(dpy, win); + XFlush(dpy); +} + + +void testRotate() +{ + + RImage *image; + RImage *rotated; + XSetWindowAttributes val; + Pixmap pix; + Window win; + + image = RLoadImage(ctx, "ballot_box.xpm", 0); + if (!image) { + puts("couldnt load ballot_box.xpm"); + return; + } + + image = RScaleImage(image, 90, 180); + + + val.background_pixel = ctx->black; + val.colormap = ctx->cmap; + win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, image->height, + image->width, + 0, ctx->depth, InputOutput, ctx->visual, + CWColormap|CWBackPixel, &val); + XStoreName(dpy, win, "Rotate"); + pix = XCreatePixmap(ctx->dpy, ctx->drawable, image->height, image->width, + ctx->depth); + + rotated = RRotateImage(image, 90.0); + + RReleaseImage(image); + RConvertImage(ctx, rotated, &pix); + XSetWindowBackgroundPixmap(dpy, win, pix); + XMapRaised(dpy, win); + XClearWindow(dpy, win); + XFlush(dpy); +} + + + +void +drawClip() +{ + RImage *img; + RColor color, from, to, tmp; + RColor cdelta, cdelta1; + RSegment segs[20]; + XSetWindowAttributes val; + Pixmap pix, back; + Window win; + + val.background_pixel = ctx->black; + val.colormap = ctx->cmap; + win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, 64, 64, + 0, ctx->depth, InputOutput, ctx->visual, + CWColormap|CWBackPixel, &val); + back = XCreatePixmap(ctx->dpy, ctx->drawable, 64, 64, ctx->depth); + + /* Standard gray tile gradient */ + from.red = 0xa6; + from.green = 0xa6; + from.blue = 0xb6; + from.alpha = 0xff; + to.red = 0x51; + to.green = 0x55; + to.blue = 0x61; + to.alpha = 0xff; + + /* Dark blue tile gradient */ + from.red = 0x28; + from.green = 0x45; + from.blue = 0x69; + from.alpha = 0xff; + to.red = 0x08; + to.green = 0x24; + to.blue = 0x20; + to.alpha = 0xff; + + img = RRenderGradient(64, 64, &from, &to, RGRD_DIAGONAL); + + RBevelImage(img, RBEV_RAISED3); +#if 1 + color.alpha = 255; + color.red = color.green = color.blue = 0; + + cdelta.alpha = 0; + cdelta.red = cdelta.green = cdelta.blue = 80; + + cdelta1.alpha = 0; + cdelta1.red = cdelta1.green = cdelta1.blue = 40; + + segs[0].x1 = segs[2].y1 = segs[4].x1 = segs[4].x2 = 63-21; + segs[0].x2 = segs[2].y2 = segs[1].x2 = segs[3].y2 = 63-2; + segs[0].y1 = segs[2].x1 = segs[1].y1 = segs[3].x1 = 2; + segs[0].y2 = segs[2].x2 = segs[6].x1 = segs[6].x2 = 21; + segs[1].x1 = segs[3].y1 = segs[5].x1 = segs[5].x2 = 63-22; + segs[1].y2 = segs[3].x2 = segs[7].x1 = segs[7].x2 = 22; + + segs[4].y1 = segs[5].y1 = segs[10].x1 = segs[11].x1 = 0; + segs[4].y2 = segs[5].y2 = segs[10].x2 = segs[11].x2 = 1; + segs[6].y1 = segs[7].y1 = segs[8].x1 = segs[9].x1 = 63-1; + segs[6].y2 = segs[7].y2 = segs[8].x2 = segs[9].x2 = 63; + segs[8].y1 = segs[8].y2 = 21; + segs[9].y1 = segs[9].y2 = 22; + segs[10].y1 = segs[10].y2 = 63-21; + segs[11].y1 = segs[11].y2 = 63-22; + /* Black segments */ + RDrawSegments(img, segs, 12, &color); + + segs[0].x1 = segs[3].y1 = 63-20; + segs[0].x2 = segs[1].y2 = segs[2].x2 = segs[3].y2 = 63-2; + segs[0].y1 = segs[1].x1 = segs[2].y1 = segs[3].x1 = 2; + segs[1].y1 = segs[2].x1 = 63-23; + segs[0].y2 = segs[3].x2 = 20; + segs[1].x2 = segs[2].y2 = 23; + /* Bevels arround black segments */ + ROperateSegments(img, RAddOperation, segs, 2, &cdelta); + ROperateSegments(img, RSubtractOperation, &segs[2], 2 ,&cdelta1); + + RGetPixel(img, 63-2, 20, &tmp); + /*RPutPixel(img, 63-1, 23, &tmp);*/ + RDrawLine(img, 63-1, 23, 63, 23, &tmp); + RGetPixel(img, 63-23, 2, &tmp); + RDrawLine(img, 63-23, 0, 63-23, 1, &tmp); + + RGetPixel(img, 23, 63-2, &tmp); + /*RPutPixel(img, 23, 63-1, &tmp);*/ + RDrawLine(img, 23, 63-1, 23, 63, &tmp); + RGetPixel(img, 2, 63-20, &tmp); + RDrawLine(img, 0, 63-23, 1, 63-23, &tmp); +#else + color.alpha = 255; + color.red = color.green = color.blue = 0; + + cdelta.alpha = 0; + cdelta.red = cdelta.green = cdelta.blue = 80; + + cdelta1.alpha = 0; + cdelta1.red = cdelta1.green = cdelta1.blue = 40; + + RDrawLine(img, 63-21, 2, 63-2, 21, &color); /* upper 2 black lines */ + ROperateLine(img, RAddOperation, 63-20, 2, 63-2, 20, &cdelta); /* the bevel arround them */ + ROperateLine(img, RSubtractOperation, 63-22, 2, 63-2, 22, &cdelta1); + RDrawLine(img, 63-21, 0, 63-21, 1, &color); /* upper small black lines */ + RDrawLine(img, 63-1, 21, 63, 21, &color); + + RGetPixel(img, 63-2, 20, &tmp); + RPutPixel(img, 63-1, 22, &tmp); + RGetPixel(img, 2, 63-22, &tmp); + RDrawLine(img, 63-22, 0, 63-22, 1, &tmp); + + RDrawLine(img, 2, 63-21, 21, 63-2, &color); /* lower 2 black lines */ + ROperateLine(img, RSubtractOperation, 2, 63-20, 20, 63-2, &cdelta1); /* the bevel arround them */ + ROperateLine(img, RAddOperation, 2, 63-22, 22, 63-2, &cdelta); + RDrawLine(img, 21, 63-1, 21, 63, &color); /* lower small black lines */ + RDrawLine(img, 0, 63-21, 1, 63-21, &color); + ROperateLine(img, RAddOperation, 22, 63-1, 22, 63, &cdelta); + /*ROperateLine(img, RAddOperation, 22, 63-1, 22, 63, &cdelta);*/ /* the bevel arround them */ + ROperateLine(img, RSubtractOperation, 0, 63-22, 1, 63-22, &cdelta1); +#endif + + RConvertImage(ctx, img, &pix); + XCopyArea(dpy, pix, back, ctx->copy_gc, 0, 0, 64, 64, 0, 0); + RReleaseImage(img); + + XSetWindowBackgroundPixmap(dpy, win, back); + XMapRaised(dpy, win); + XClearWindow(dpy, win); + XFlush(dpy); +} + + + +void +benchmark() +{ + RImage *img; + RColor color; + RColor cdelta; + double t1, t2, total, d1=0, d2=0, d3=0; + struct timeval timev; + int i, j; + + puts("Starting benchmark"); + + gettimeofday(&timev, NULL); + t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + + img = RCreateImage(1024, 768, True); + + gettimeofday(&timev, NULL); + t2 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + total = t2 - t1; + printf("Image created in %f sec\n", total); + + gettimeofday(&timev, NULL); + t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + + color.red = 0x28; + color.green = 0x45; + color.blue = 0x69; + color.alpha = 0xff; + RClearImage(img, &color); + + color.red = 0xff; + color.green = 0x7d; + color.blue = 0x52; + color.alpha = 0xff; + cdelta.red = cdelta.green = cdelta.blue = 80; + cdelta.alpha = 0; + + gettimeofday(&timev, NULL); + t2 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + total = t2 - t1; + printf("Image filled in %f sec\n", total); + + for(j=1; j<6; j++) { + printf("Pass %d...\n", j); + gettimeofday(&timev, NULL); + t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + + color.alpha = 0xff; + for (i=0; i< 10000; i++) { + RDrawLine(img, 0, i%64, i%64, 63, &color); + } + + gettimeofday(&timev, NULL); + t2 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + total = t2 - t1; + printf("Drawing 10000 lines in %f sec\n", total); + d1 += total; + + gettimeofday(&timev, NULL); + t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + + color.alpha = 80; + for (i=0; i< 10000; i++) { + RDrawLine(img, 0, i%64, i%64, 63, &color); + } + + gettimeofday(&timev, NULL); + t2 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + total = t2 - t1; + printf("Drawing 10000 lines with alpha in %f sec\n", total); + d2+=total; + + gettimeofday(&timev, NULL); + t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + + for (i=0; i< 10000; i++) { + ROperateLine(img, RAddOperation, 0, i%64, i%64, 63, &cdelta); + } + + gettimeofday(&timev, NULL); + t2 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + total = t2 - t1; + printf("Altering 10000 lines in %f sec\n", total); + d3+=total; + } + printf("Average: %f, %f, %f\n", d1/5, d2/5, d3/5); + + RReleaseImage(img); +} + + +int main(int argc, char **argv) +{ + RContextAttributes attr; + int visualID = -1; + + ProgName = strrchr(argv[0],'/'); + if (!ProgName) + ProgName = argv[0]; + else + ProgName++; + + dpy = XOpenDisplay(""); + if (!dpy) { + puts("cant open display"); + exit(1); + } + + attr.flags = RC_RenderMode | RC_ColorsPerChannel; + + attr.render_mode = RDitheredRendering; + attr.colors_per_channel = 4; + + if (visualID >= 0) { + attr.flags |= RC_VisualID; + attr.visualid = visualID; + } + + ctx = RCreateContext(dpy, DefaultScreen(dpy), &attr); + + if (!ctx) { + printf("could not initialize graphics library context: %s\n", + RMessageForError(RErrorCode)); + exit(1); + } + + /* Here are the things we want to test */ + testDraw(); + + testBevel(); + + drawClip(); + + testScale(); + + testRotate(); + + /* benchmark();*/ + + getchar(); + return 0; +} + diff -Naur WindowMaker-0.91.0/wrlib/tests/testgrad.c wm/wrlib/tests/testgrad.c --- WindowMaker-0.91.0/wrlib/tests/testgrad.c 1970-01-01 03:00:00 +0300 +++ wm/wrlib/tests/testgrad.c 2005-01-06 18:48:42 +0300 @@ -0,0 +1,213 @@ + + +#include +#include "wraster.h" +#include +#include +#include +#ifdef BENCH +#include +#include +#endif + + +Display *dpy; +Window win; +RContext *ctx; +RImage *imgh, *imgv, *imgd; +Pixmap pix; +char *ProgName; + + +void +print_help() +{ + printf("usage: %s [-options] color1 [color2 ...]\n", ProgName); + puts("options:"); + puts(" -m match colors"); + puts(" -d dither colors (default)"); + puts(" -c colors per channel to use"); + puts(" -v visual id to use"); +} + +#ifdef BENCH +#include "bench.h" +#endif +int main(int argc, char **argv) +{ + RContextAttributes attr; + RColor **colors = NULL; + int i, rmode = RDitheredRendering, ncolors = 0, cpc = 4; + char **color_name; + XColor color; + XSetWindowAttributes val; + int visualID = -1; +#ifdef BENCH + double t1, t2, total, t, rt; + struct timeval timev; +#endif + + ProgName = strrchr(argv[0],'/'); + if (!ProgName) + ProgName = argv[0]; + else + ProgName++; + + color_name = (char **) malloc(sizeof(char*) * argc); + if(color_name == NULL) { + fprintf(stderr, "Cannot allocate memory!\n"); + exit(1); + } + + if (argc>1) { + for (i=1; i=argc) { + fprintf(stderr, "too few arguments for %s\n", argv[i-1]); + exit(0); + } + if (sscanf(argv[i], "%i", &cpc)!=1) { + fprintf(stderr, "bad value for colors per channel: \"%s\"\n", argv[i]); + exit(0); + } + } else if (strcmp(argv[i], "-v")==0) { + i++; + if (i>=argc) { + fprintf(stderr, "too few arguments for %s\n", argv[i-1]); + exit(0); + } + if (sscanf(argv[i], "%i", &visualID)!=1) { + fprintf(stderr, "bad value for visual ID: \"%s\"\n", argv[i]); + exit(0); + } + } else if (argv[i][0] != '-') { + color_name[ncolors++] = argv[i]; + } else { + print_help(); + exit(1); + } + } + } + + if (ncolors == 0) { + print_help(); + exit(1); + } + + dpy = XOpenDisplay(""); + if (!dpy) { + puts("cant open display"); + exit(1); + } + attr.flags = RC_RenderMode | RC_ColorsPerChannel; + + attr.render_mode = rmode; + attr.colors_per_channel = cpc; + + if (visualID >= 0) { + attr.flags |= RC_VisualID; + attr.visualid = visualID; + } + + ctx = RCreateContext(dpy, DefaultScreen(dpy), &attr); + + if (!ctx) { + printf("could not initialize graphics library context: %s\n", + RMessageForError(RErrorCode)); + exit(1); + } + + colors = malloc(sizeof(RColor*)*(ncolors+1)); + for (i=0; icmap, color_name[i], &color)) { + printf("could not parse color \"%s\"\n", color_name[i]); + exit(1); + } + else { + colors[i] = malloc(sizeof(RColor)); + colors[i]->red = color.red >> 8; + colors[i]->green = color.green >> 8; + colors[i]->blue = color.blue >> 8; + printf("0x%02x%02x%02x\n", colors[i]->red, colors[i]->green, + colors[i]->blue); + } + } + colors[i] = NULL; + + val.background_pixel = ctx->black; + val.colormap = ctx->cmap; + val.backing_store = Always; +#ifdef BENCH + win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, 250, 250, + 0, ctx->depth, InputOutput, ctx->visual, + CWColormap|CWBackPixel|CWBackingStore, &val); +#else + win = XCreateWindow(dpy, DefaultRootWindow(dpy), 10, 10, 750, 250, + 0, ctx->depth, InputOutput, ctx->visual, + CWColormap|CWBackPixel|CWBackingStore, &val); +#endif + XMapRaised(dpy, win); + XFlush(dpy); + +#ifdef BENCH + rt = 0; + gettimeofday(&timev, NULL); + t = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + for (i=0; i<9; i++) { + if (i>0) + printf("\nrepeating...\n\n"); + gettimeofday(&timev, NULL); + t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + if (i%3==0) + imgh = RRenderMultiGradient(550, 550, colors, RGRD_HORIZONTAL); + else if (i%3==1) + imgh = RRenderMultiGradient(550, 550, colors, RGRD_VERTICAL); + else + imgh = RRenderMultiGradient(550, 550, colors, RGRD_DIAGONAL); + + gettimeofday(&timev, NULL); + t2 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + total = t2 - t1; + printf("gradient rendered in %f sec\n", total); + + RConvertImage(ctx, imgh, &pix); + gettimeofday(&timev, NULL); + t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + total = t1 - t2; + rt += total; + printf("image converted in %f sec\n", total); + + XCopyArea(dpy, pix, win, ctx->copy_gc, 0, 0, 250, 250, 0, 0); + + XFlush(dpy); + } + t1 = (double)timev.tv_sec + (((double)timev.tv_usec)/1000000); + printf("------------------------------------------\n"); + printf("%i images processed in %f sec\n", i, t1-t); + printf("average time per convertion %f sec\n", rt/i); + printf("------------------------------------------\n"); +#else + imgh = RRenderMultiGradient(250, 250, colors, RGRD_HORIZONTAL); + imgv = RRenderMultiGradient(250, 250, colors, RGRD_VERTICAL); + imgd = RRenderMultiGradient(250, 250, colors, RGRD_DIAGONAL); + RConvertImage(ctx, imgh, &pix); + XCopyArea(dpy, pix, win, ctx->copy_gc, 0, 0, 250, 250, 0, 0); + + RConvertImage(ctx, imgv, &pix); + XCopyArea(dpy, pix, win, ctx->copy_gc, 0, 0, 250, 250, 250, 0); + + RConvertImage(ctx, imgd, &pix); + XCopyArea(dpy, pix, win, ctx->copy_gc, 0, 0, 250, 250, 500, 0); + + XFlush(dpy); +#endif + + getchar(); + return 0; +} + diff -Naur WindowMaker-0.91.0/wrlib/tests/test.png wm/wrlib/tests/test.png --- WindowMaker-0.91.0/wrlib/tests/test.png 1970-01-01 03:00:00 +0300 +++ wm/wrlib/tests/test.png 2005-01-06 18:48:42 +0300 @@ -0,0 +1,13 @@ +PNG + + IHDR #ꦷgAMA1_bKGD~# "IDATxݙ_luKrM.ZKʴRM Y.R2Z[Ɋ^qb,ZɊ (0PrB&\)(D~D4KK/9wUU4AΝ;ww|猕i +|ؘ}}+M!3߀ޱ&}߯ZfF5[,@f.3rZtL017qHÿto Z?TR4٢:O~-{D`kEU4")sZHfn2@6RtXO)ޯ;voR'zֽO۴=5ߣDOqD Oc3`co47e k$9SQ aȗ~U5`:OE5CJ :u'|VMt?\3%'*JS_7W&; 42@THtZ]m'Ի6tmrwK'Z׉^щ~QCbV b^NJ^Jr宁Z S _XfxNEOfͅz-/?ջu5Dp^vGVˏGW5| %˿\5ėf%XYhNf uSSn6Ys;;:p-'AW:UGpxqB?7GsZ g`/f@%6mW#r?zf7k.{zzz _NF٪ At5Huta>4u-⋋=wTK\*< e7 M@x޶"&nܛ9f5|>IEtSqEUvvhƫ ^R\TjVz=XtodɎap~~ p}c ׍{3lvB}ކ|9:^TyJz5%WkFƫ%X go|h7#aL$7u)7ݬP?*>WU4^Y+/WZO?{1+^ |{ w + u'0oh5HM@3~ݸ7sf7k.7e-/NK?RxZ s'@/eAY@ [?p| HQtu yfKϼQ-ѪHM@3~ݸ7sf7k.ԇ _|IV?4ħځN,'[3kXf|>o$_NY%an }MEFj0&fqo攛n\~|[~|!~ݻj%VyN&#āHFq@ ҊU;2t`@2zKoT۵3=-nj7#aL$7Vlvkeݻμ K@pR (#8grRKX4L;V݌14׍{3\67aZi.3o~`i޻ {pi 3 +=)opQqdv%)3{>5XaXiH4ь̤+[h7#aL$׀fiZV!_ +Cɽ?x~;w1[o zDE3ؓI~]Rl~%yZ+1S5ISZj݈VF˜H.~xVv: N]mx⁍/43}Ȉ c'ݛ l/Ib*aS1Q&1%?3j݈VD\9߭;wR'3j=K3Y ҕx{vi 1\[SΦx>lOcJF ޒ4ŨuWGjO9hn$83*}}§Rw~;@4k7syv|aE%aL>  j0&3gƫˁȽ_BAqޓ=vA&folnon4|6jd.dndoGq?eí۵IENDB` \ diff -Naur WindowMaker-0.91.0/wrlib/tests/testrot.c wm/wrlib/tests/testrot.c --- WindowMaker-0.91.0/wrlib/tests/testrot.c 1970-01-01 03:00:00 +0300 +++ wm/wrlib/tests/testrot.c 2005-01-06 18:48:42 +0300 @@ -0,0 +1,70 @@ + + +#include +#include "wraster.h" +#include +#include +#include +#include "tile.xpm" +Display *dpy; +Window win; +RContext *ctx; +RImage *img; +Pixmap pix; + + +#define MAX(a,b) (a)>(b) ? (a) : (b) + +int main(int argc, char **argv) +{ + RContextAttributes attr; + float a; + + dpy = XOpenDisplay(""); + if (!dpy) { + puts("cant open display"); + exit(1); + } + + attr.flags = RC_RenderMode | RC_ColorsPerChannel; + attr.render_mode = RDitheredRendering; + attr.colors_per_channel = 4; + ctx = RCreateContext(dpy, DefaultScreen(dpy), &attr); + + if (argc<2) + img = RGetImageFromXPMData(ctx, image_name); + else + img = RLoadImage(ctx, argv[1], 0); + + if (!img) { + puts(RMessageForError(RErrorCode)); + exit(1); + } + win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10, 10, + MAX(img->width, img->height), + MAX(img->height, img->width), 0, 0, 0); + XMapRaised(dpy, win); + XFlush(dpy); + + a = 0; + while (1) { + RImage *tmp; + + a = a + 1.0; + + tmp = RRotateImage(img, a); + if (!RConvertImage(ctx, tmp, &pix)) { + puts(RMessageForError(RErrorCode)); + exit(1); + } + RReleaseImage(tmp); + + XSetWindowBackgroundPixmap(dpy, win, pix); + XFreePixmap(dpy, pix); + XClearWindow(dpy, win); + XSync(dpy, 0); + usleep(50000); + } + exit(0); +} + diff -Naur WindowMaker-0.91.0/wrlib/tests/tile.xpm wm/wrlib/tests/tile.xpm --- WindowMaker-0.91.0/wrlib/tests/tile.xpm 1970-01-01 03:00:00 +0300 +++ wm/wrlib/tests/tile.xpm 2005-01-06 18:48:42 +0300 @@ -0,0 +1,125 @@ +/* XPM */ +static char *image_name[] = { +/* width height num_colors chars_per_pixel */ +" 64 64 54 1", +/* colors */ +". c #ffffff", +"# c #000000", +"a c #516161", +"b c #a2a2b2", +"c c #a2a2a2", +"d c #a292b2", +"e c #92a2a2", +"f c #a292a2", +"g c #9292a2", +"h c #929292", +"i c #9282a2", +"j c #829292", +"k c #928292", +"l c #828292", +"m c #828282", +"n c #827192", +"o c #615161", +"p c #92a2b2", +"q c #9292b2", +"r c #8292a2", +"s c #8282a2", +"t c #718292", +"u c #718282", +"v c #515161", +"w c #515151", +"x c #827182", +"y c #415151", +"z c #514151", +"A c #717192", +"B c #717182", +"C c #717171", +"D c #414151", +"E c #716182", +"F c #617182", +"G c #415141", +"H c #414141", +"I c #617171", +"J c #413041", +"K c #304141", +"L c #716171", +"M c #616171", +"N c #616182", +"O c #303030", +"P c #616161", +"Q c #303041", +"R c #516171", +"S c #304130", +"T c #615171", +"U c #203030", +"V c #302030", +"W c #515171", +"X c #202030", +"Y c #202020", +"Z c #413051", +/* pixels */ +"...............................................................#", +"..............................................................a#", +"..bcbcdcdcdcdefgdefgfgfgggfgghihihihijijijklkjklklkllmlllmnmnmo#", +"..bbebpbebebededeqegegegegegrgggjgjgjijijsjijsjljljllllltltlula#", +"..bcdcbcfcdefefefgfefgfhfgghghghihijkhijkjkjklklkllmlmlmnmnmnmv#", +"..pbbbededededeqefeqegggggggggjgrgjijijijijsjllljllllltlllununw#", +"..dcdcdcdefgfefgfgfgghggghihihihijkjijklkjklllkllmlllmnmnunmnuv#", +"..ebebebededeqegegegggegrgrgjgjgjijijsjkjsjljljlllllultlunulunw#", +"..dcfcdefefefgfgfgfhfhghihghihijkjijkjkjklklkllmlmlmnmnmnmnuxuv#", +"..ededededeqefegegggggggggjgjgjijijijijsjllljllllltlllununununy#", +"..fcdefgfefgfgfgghggghihihihijkjijklklklllkllmnmlmnmnununuxunuz#", +"..ebeqedeqegegegggggrgrgjgjgjijijsjkjsjljljlllllululununununuAy#", +"..defefefgfgfgghfhghihghihijkjijkjkjklklkllmlmlmnmnmnmnuxuxuxBz#", +"..ededeqegggegggggrgggjijgjijijijijsjllllllllltltlununununuAuBy#", +"..fgfefgfgfgghggghihihihijklijklklklllkllmnmnmnmnununuxunuxBxBz#", +"..efeqegegegggggjgrgjgjgjijijsjljsjljljltlllululununununuAuBuBy#", +"..fefgfgfgghghghihghihijkjkjklkjklkmkllmlmlmnmnuxmnuxuxuxBxBxBz#", +"..eqegggegggggrgggjijijijijijkjsjlllllllllultlununununuAuBBAuBy#", +"..fgfgfgghghghihihihijklijklklkllllllmnmnmnmnununuxBxuxBBBxBBBz#", +"..egegegggggjgrgjgjgjijijsjljljllljltltlululununununuAuBuBuBBBy#", +"..fgfgghghghihihihijkjkjklklklkmkllmnmlmnmnuxunuxuxuxBxBxBBCBCz#", +"..ggegggggjgggjijijijijsjkjsjlllllllllultlununununuAuBBBuBBBBBD#", +"..fgghghghihijihijklijklklkllllllmnmnmnmnununuxBxBxBBBxBBCEBBCz#", +"..egggggjgrgjijgjsjijsjljljllllltltlululununuAunuAuBuBuBBBBBFBG#", +"..ghghghihihkhijkjkjklklkllmkllmnmlmnmnuxunuxuxuxBxBxBBCBCBCECD#", +"..ggggjgrgjijijijijsjllsjllllltllluntlununununuAuBBBBBBBBBFBFBH#", +"..ihghihijijijklkjklklkllmlllmnmnmnmnununuxBxBxBBBxBBCEBECECEIJ#", +"..ggjgjgjijijsjijsjljljllllltltlululununuAuBuAuBuBuBFBBBIBFBIEH#", +"..ghihijkhijkjkjklklkllmlmlmnmlmnmnuxunuxBxuxBxBxBBCBCBCECEIECH#", +"..jgrgjijijijijsjllljllllltlllununununununuAuBBBBBBBBBFBFBIEIEK#", +"..ihijkjijklkjklklkllmlllmnmnmnmnununuxBxBxBBBBBBCEBECECEIEIEIJ#", +"..jgjijijsjijsjljljllllltltlululununuAuBuBuBBBuBFBFBIBIBIEIBIEK#", +"..ijkjijkjkjklklkllmlmlmnmnmnmnuxunuxBxBxBxBxBBCECBCECEIECEILIJ#", +"..jijijijijsjllljllllltlllununununuAunuAuBBBBBBBBBFBFBIEIEIEIEK#", +"..kjijklkjklllkllmlllmnmnunmnuxunuxBxBxBBBBBBCECECECEIEIEILMEMJ#", +"..jijsjkjsjljljlllllultlunulununuAuBuBuBBBBBFBFBIBIBIEIBINIEINK#", +"..ijkjkjklklkllmlmlmnmnmnmnuxuxuxBxBxBBBxBBCECBCECEIECEILILILMJ#", +"..jijijsjllljllllltltlununununuAuBBAuBBBBBFBBBIEFBIEIEIEIEINIMK#", +"..klklklllkllmnmlmnmnununuxunuxBxBxBBBBBBCECECECEIEIEILMEMLMMMJ#", +"..jkjsjljljlllllululununununuAuBuBuBBBBBFBFBIBIBIEIBINININIMIMK#", +"..kjklklkllmlmlmnmnunmnuxuxuxBxBxBBCBCBCECBCECEIECEILMLILMLMLMJ#", +"..jsjlllllllllultlununununuAuBBAuBBBBBFBBBIEIEIEIEIEIEINIMMMMMO#", +"..klllkllmnmnmnmnununuxunuxBxBxBBBBBBCECECECEIEIEILMLMLMMMMMMPQ#", +"..jllljltlllululununununuAuBuBuBBBBBFBFBIBIBIEIEINININIMMMIMRMS#", +"..kmkllmnmlmnmnuxunuxuxuxBxBxBBCBCBCECECECEIECEILMLMLMLMLMMPTPQ#", +"..llllllllultlununununuAuBBAuBBBBBFBBBIEIEIEIEINIEINIMMMMMMMMMU#", +"..lllmnmnmnmnununuxBxuxBBBxBBCBBBCECEIECEIEIEILMLMLMMMMMMPTPTPV#", +"..lltltlululununununuAuBuBuBBBBBFBFBIEIBIEIEINININIMMMMMRMRMaMU#", +"..lmnmlmnmnuxunuxuxuxBxBxBBCBCBCECECECEILILILMLMLMMMLMMPTPMPTPO#", +"..llllultlununununuAuBBBuBBBBBFBFBIEIEIEIEININMNIMMMMMRMMMRTRMU#", +"..nmnmnmnununuxBxBxBBBxBBCEBBCECEIEIEIEIEILMLMLMMMMMMPTPTPTPTaV#", +"..tlululununuAunuAuBuBuBBBBBFBFBIEIBIEIEINIMIMIMMMMMRMRMaMaMaTU#", +"..lmnmnuxunuxBxuxBxBxBBCBCBCECEIECEILILILMLMLMMMMMMPTPMPTPTaTPV#", +"..unulununununuAuBBBBBBBBBFBFBIEIEIEIEININMNIMMMMMRMMMRTRMaTaTU#", +"..nmnununuxBxBxBBBxBBCEBECECEIEIEILIEILMLMLMMMMMMPTPTPTPTaTaTaV#", +"..ulununuAuBuAuBBBuBFBBBIBFBIEIBIEIEINIMIMIMMMMMRMRMaMaMaTaTaWU#", +"..nuxunuxBxBxBxBxBBCECBCECEIECEILILILMLMLMMMMMMPTPTPTPTaTPTaovV#", +"..ununununuAuBBBBBBBBBFBFBIEIEIEIEINIMMNIMMMMMRMMMaTRMaTaTaWaTU#", +"..nunuxBxBxBBBBBBCECECECEIEIEILMEILMMMLMMMMMMPTPTaTPTaTaTaovovV#", +"..unuAuBuBuBBBBBFBFBIBIBIEIBIEIEINIMIMIMMMMMRMRMaTaMaTaTaWaWaWU#", +"..nuxBxBxBxBxBBCECBCECEIECEILILILMLMLMMPMMMPTPTPTPTaTaTaovovovX#", +"..uAunuAuBBBBBBBBBIBFBIEIEIEIEINIMMMIMMMMMRMRMaTRTaTaTaWaWvWavY#", +"..owvwvwvwzwzyzyzGzDzHzHDHZHDHJHJKJKJSJOQOQOQOVOVOVOVUVXVYVYXYX#", +".###############################################################" +}; diff -Naur WindowMaker-0.91.0/wrlib/tests/view.c wm/wrlib/tests/view.c --- WindowMaker-0.91.0/wrlib/tests/view.c 1970-01-01 03:00:00 +0300 +++ wm/wrlib/tests/view.c 2005-01-06 18:48:42 +0300 @@ -0,0 +1,93 @@ +#include +#include "wraster.h" +#include +#include +#include "tile.xpm" +Display *dpy; +Window win; +RContext *ctx; +RImage *img; +Pixmap pix; + + + +int +main(int argc, char **argv) +{ + RContextAttributes attr; + + dpy = XOpenDisplay(""); + if (!dpy) { + puts("cant open display"); + exit(1); + } + + attr.flags = RC_RenderMode | RC_ColorsPerChannel; + attr.render_mode = RDitheredRendering; + attr.colors_per_channel = 4; + ctx = RCreateContext(dpy, DefaultScreen(dpy), &attr); + + if (argc<2) + img = RGetImageFromXPMData(ctx, image_name); + else + img = RLoadImage(ctx, argv[1], 0); + + if (!img) { + puts(RMessageForError(RErrorCode)); + exit(1); + } + + if (argc > 2) { + RImage *tmp = img; + + img = RScaleImage(tmp, tmp->width*atol(argv[2]), + tmp->height*atol(argv[2])); + /*img = RSmoothScaleImage(tmp, tmp->width*atol(argv[2]), + tmp->height*atol(argv[2])); + */ + + RReleaseImage(tmp); + } + +#if 0 + if (argc > 2) { + img = RScaleImage(img, img->width*atof(argv[2]), + img->height*atof(argv[2])); + } + + { + RImage *tmp = RCreateImage(200, 200, True); + RColor col = {0,0,255,255}; + + if (img->format == RRGBAFormat) + puts("alpha"); + else + puts("no alpha"); + + RClearImage(tmp, &col); + + RCombineArea(tmp, img, 0, 0, 20, 20, 10, 10); + img = tmp; + } +#endif + + if (!RConvertImage(ctx, img, &pix)) { + puts(RMessageForError(RErrorCode)); + exit(1); + } + + printf("%ix%i\n", img->width, img->height); + + + + win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10, 10, + img->width, img->height, 0, 0, 0); + XSetWindowBackgroundPixmap(dpy, win, pix); + XClearWindow(dpy, win); + XMapRaised(dpy, win); + XFlush(dpy); + getchar(); + + return 0; +} + diff -Naur WindowMaker-0.91.0/wrlib/tile.xpm wm/wrlib/tile.xpm --- WindowMaker-0.91.0/wrlib/tile.xpm 2000-01-15 01:16:03 +0300 +++ wm/wrlib/tile.xpm 1970-01-01 03:00:00 +0300 @@ -1,125 +0,0 @@ -/* XPM */ -static char *image_name[] = { -/* width height num_colors chars_per_pixel */ -" 64 64 54 1", -/* colors */ -". c #ffffff", -"# c #000000", -"a c #516161", -"b c #a2a2b2", -"c c #a2a2a2", -"d c #a292b2", -"e c #92a2a2", -"f c #a292a2", -"g c #9292a2", -"h c #929292", -"i c #9282a2", -"j c #829292", -"k c #928292", -"l c #828292", -"m c #828282", -"n c #827192", -"o c #615161", -"p c #92a2b2", -"q c #9292b2", -"r c #8292a2", -"s c #8282a2", -"t c #718292", -"u c #718282", -"v c #515161", -"w c #515151", -"x c #827182", -"y c #415151", -"z c #514151", -"A c #717192", -"B c #717182", -"C c #717171", -"D c #414151", -"E c #716182", -"F c #617182", -"G c #415141", -"H c #414141", -"I c #617171", -"J c #413041", -"K c #304141", -"L c #716171", -"M c #616171", -"N c #616182", -"O c #303030", -"P c #616161", -"Q c #303041", -"R c #516171", -"S c #304130", -"T c #615171", -"U c #203030", -"V c #302030", -"W c #515171", -"X c #202030", -"Y c #202020", -"Z c #413051", -/* pixels */ -"...............................................................#", -"..............................................................a#", -"..bcbcdcdcdcdefgdefgfgfgggfgghihihihijijijklkjklklkllmlllmnmnmo#", -"..bbebpbebebededeqegegegegegrgggjgjgjijijsjijsjljljllllltltlula#", -"..bcdcbcfcdefefefgfefgfhfgghghghihijkhijkjkjklklkllmlmlmnmnmnmv#", -"..pbbbededededeqefeqegggggggggjgrgjijijijijsjllljllllltlllununw#", -"..dcdcdcdefgfefgfgfgghggghihihihijkjijklkjklllkllmlllmnmnunmnuv#", -"..ebebebededeqegegegggegrgrgjgjgjijijsjkjsjljljlllllultlunulunw#", -"..dcfcdefefefgfgfgfhfhghihghihijkjijkjkjklklkllmlmlmnmnmnmnuxuv#", -"..ededededeqefegegggggggggjgjgjijijijijsjllljllllltlllununununy#", -"..fcdefgfefgfgfgghggghihihihijkjijklklklllkllmnmlmnmnununuxunuz#", -"..ebeqedeqegegegggggrgrgjgjgjijijsjkjsjljljlllllululununununuAy#", -"..defefefgfgfgghfhghihghihijkjijkjkjklklkllmlmlmnmnmnmnuxuxuxBz#", -"..ededeqegggegggggrgggjijgjijijijijsjllllllllltltlununununuAuBy#", -"..fgfefgfgfgghggghihihihijklijklklklllkllmnmnmnmnununuxunuxBxBz#", -"..efeqegegegggggjgrgjgjgjijijsjljsjljljltlllululununununuAuBuBy#", -"..fefgfgfgghghghihghihijkjkjklkjklkmkllmlmlmnmnuxmnuxuxuxBxBxBz#", -"..eqegggegggggrgggjijijijijijkjsjlllllllllultlununununuAuBBAuBy#", -"..fgfgfgghghghihihihijklijklklkllllllmnmnmnmnununuxBxuxBBBxBBBz#", -"..egegegggggjgrgjgjgjijijsjljljllljltltlululununununuAuBuBuBBBy#", -"..fgfgghghghihihihijkjkjklklklkmkllmnmlmnmnuxunuxuxuxBxBxBBCBCz#", -"..ggegggggjgggjijijijijsjkjsjlllllllllultlununununuAuBBBuBBBBBD#", -"..fgghghghihijihijklijklklkllllllmnmnmnmnununuxBxBxBBBxBBCEBBCz#", -"..egggggjgrgjijgjsjijsjljljllllltltlululununuAunuAuBuBuBBBBBFBG#", -"..ghghghihihkhijkjkjklklkllmkllmnmlmnmnuxunuxuxuxBxBxBBCBCBCECD#", -"..ggggjgrgjijijijijsjllsjllllltllluntlununununuAuBBBBBBBBBFBFBH#", -"..ihghihijijijklkjklklkllmlllmnmnmnmnununuxBxBxBBBxBBCEBECECEIJ#", -"..ggjgjgjijijsjijsjljljllllltltlululununuAuBuAuBuBuBFBBBIBFBIEH#", -"..ghihijkhijkjkjklklkllmlmlmnmlmnmnuxunuxBxuxBxBxBBCBCBCECEIECH#", -"..jgrgjijijijijsjllljllllltlllununununununuAuBBBBBBBBBFBFBIEIEK#", -"..ihijkjijklkjklklkllmlllmnmnmnmnununuxBxBxBBBBBBCEBECECEIEIEIJ#", -"..jgjijijsjijsjljljllllltltlululununuAuBuBuBBBuBFBFBIBIBIEIBIEK#", -"..ijkjijkjkjklklkllmlmlmnmnmnmnuxunuxBxBxBxBxBBCECBCECEIECEILIJ#", -"..jijijijijsjllljllllltlllununununuAunuAuBBBBBBBBBFBFBIEIEIEIEK#", -"..kjijklkjklllkllmlllmnmnunmnuxunuxBxBxBBBBBBCECECECEIEIEILMEMJ#", -"..jijsjkjsjljljlllllultlunulununuAuBuBuBBBBBFBFBIBIBIEIBINIEINK#", -"..ijkjkjklklkllmlmlmnmnmnmnuxuxuxBxBxBBBxBBCECBCECEIECEILILILMJ#", -"..jijijsjllljllllltltlununununuAuBBAuBBBBBFBBBIEFBIEIEIEIEINIMK#", -"..klklklllkllmnmlmnmnununuxunuxBxBxBBBBBBCECECECEIEIEILMEMLMMMJ#", -"..jkjsjljljlllllululununununuAuBuBuBBBBBFBFBIBIBIEIBINININIMIMK#", -"..kjklklkllmlmlmnmnunmnuxuxuxBxBxBBCBCBCECBCECEIECEILMLILMLMLMJ#", -"..jsjlllllllllultlununununuAuBBAuBBBBBFBBBIEIEIEIEIEIEINIMMMMMO#", -"..klllkllmnmnmnmnununuxunuxBxBxBBBBBBCECECECEIEIEILMLMLMMMMMMPQ#", -"..jllljltlllululununununuAuBuBuBBBBBFBFBIBIBIEIEINININIMMMIMRMS#", -"..kmkllmnmlmnmnuxunuxuxuxBxBxBBCBCBCECECECEIECEILMLMLMLMLMMPTPQ#", -"..llllllllultlununununuAuBBAuBBBBBFBBBIEIEIEIEINIEINIMMMMMMMMMU#", -"..lllmnmnmnmnununuxBxuxBBBxBBCBBBCECEIECEIEIEILMLMLMMMMMMPTPTPV#", -"..lltltlululununununuAuBuBuBBBBBFBFBIEIBIEIEINININIMMMMMRMRMaMU#", -"..lmnmlmnmnuxunuxuxuxBxBxBBCBCBCECECECEILILILMLMLMMMLMMPTPMPTPO#", -"..llllultlununununuAuBBBuBBBBBFBFBIEIEIEIEININMNIMMMMMRMMMRTRMU#", -"..nmnmnmnununuxBxBxBBBxBBCEBBCECEIEIEIEIEILMLMLMMMMMMPTPTPTPTaV#", -"..tlululununuAunuAuBuBuBBBBBFBFBIEIBIEIEINIMIMIMMMMMRMRMaMaMaTU#", -"..lmnmnuxunuxBxuxBxBxBBCBCBCECEIECEILILILMLMLMMMMMMPTPMPTPTaTPV#", -"..unulununununuAuBBBBBBBBBFBFBIEIEIEIEININMNIMMMMMRMMMRTRMaTaTU#", -"..nmnununuxBxBxBBBxBBCEBECECEIEIEILIEILMLMLMMMMMMPTPTPTPTaTaTaV#", -"..ulununuAuBuAuBBBuBFBBBIBFBIEIBIEIEINIMIMIMMMMMRMRMaMaMaTaTaWU#", -"..nuxunuxBxBxBxBxBBCECBCECEIECEILILILMLMLMMMMMMPTPTPTPTaTPTaovV#", -"..ununununuAuBBBBBBBBBFBFBIEIEIEIEINIMMNIMMMMMRMMMaTRMaTaTaWaTU#", -"..nunuxBxBxBBBBBBCECECECEIEIEILMEILMMMLMMMMMMPTPTaTPTaTaTaovovV#", -"..unuAuBuBuBBBBBFBFBIBIBIEIBIEIEINIMIMIMMMMMRMRMaTaMaTaTaWaWaWU#", -"..nuxBxBxBxBxBBCECBCECEIECEILILILMLMLMMPMMMPTPTPTPTaTaTaovovovX#", -"..uAunuAuBBBBBBBBBIBFBIEIEIEIEINIMMMIMMMMMRMRMaTRTaTaTaWaWvWavY#", -"..owvwvwvwzwzyzyzGzDzHzHDHZHDHJHJKJKJSJOQOQOQOVOVOVOVUVXVYVYXYX#", -".###############################################################" -}; diff -Naur WindowMaker-0.91.0/wrlib/view.c wm/wrlib/view.c --- WindowMaker-0.91.0/wrlib/view.c 2004-10-12 22:23:48 +0400 +++ wm/wrlib/view.c 1970-01-01 03:00:00 +0300 @@ -1,93 +0,0 @@ -#include -#include "wraster.h" -#include -#include -#include "tile.xpm" -Display *dpy; -Window win; -RContext *ctx; -RImage *img; -Pixmap pix; - - - -int -main(int argc, char **argv) -{ - RContextAttributes attr; - - dpy = XOpenDisplay(""); - if (!dpy) { - puts("cant open display"); - exit(1); - } - - attr.flags = RC_RenderMode | RC_ColorsPerChannel; - attr.render_mode = RDitheredRendering; - attr.colors_per_channel = 4; - ctx = RCreateContext(dpy, DefaultScreen(dpy), &attr); - - if (argc<2) - img = RGetImageFromXPMData(ctx, image_name); - else - img = RLoadImage(ctx, argv[1], 0); - - if (!img) { - puts(RMessageForError(RErrorCode)); - exit(1); - } - - if (argc > 2) { - RImage *tmp = img; - - img = RScaleImage(tmp, tmp->width*atol(argv[2]), - tmp->height*atol(argv[2])); - /*img = RSmoothScaleImage(tmp, tmp->width*atol(argv[2]), - tmp->height*atol(argv[2])); - */ - - RReleaseImage(tmp); - } - -#if 0 - if (argc > 2) { - img = RScaleImage(img, img->width*atof(argv[2]), - img->height*atof(argv[2])); - } - - { - RImage *tmp = RCreateImage(200, 200, True); - RColor col = {0,0,255,255}; - - if (img->format == RRGBAFormat) - puts("alpha"); - else - puts("no alpha"); - - RClearImage(tmp, &col); - - RCombineArea(tmp, img, 0, 0, 20, 20, 10, 10); - img = tmp; - } -#endif - - if (!RConvertImage(ctx, img, &pix)) { - puts(RMessageForError(RErrorCode)); - exit(1); - } - - printf("%ix%i\n", img->width, img->height); - - - - win = XCreateSimpleWindow(dpy, DefaultRootWindow(dpy), 10, 10, - img->width, img->height, 0, 0, 0); - XSetWindowBackgroundPixmap(dpy, win, pix); - XClearWindow(dpy, win); - XMapRaised(dpy, win); - XFlush(dpy); - getchar(); - - return 0; -} - diff -Naur WindowMaker-0.91.0/wrlib/x86_specific.c wm/wrlib/x86_specific.c --- WindowMaker-0.91.0/wrlib/x86_specific.c 2004-10-13 01:18:01 +0400 +++ wm/wrlib/x86_specific.c 2004-10-31 04:47:43 +0300 @@ -37,33 +37,33 @@ result = 0; asm volatile - ("pushal \n\t" // please dont forget this in any asm - "pushfl \n\t" // check whether cpuid supported - "pop %%eax \n\t" - "movl %%eax, %%ebx \n\t" - "xorl $(1<<21), %%eax \n\t" - "pushl %%eax \n\t" - "popfl \n\t" - "pushfl \n\t" - "popl %%eax \n\t" - "xorl %%ebx, %%eax \n\t" - "andl $(1<<21), %%eax \n\t" - "jz .NotPentium \n\t" - "xorl %%eax, %%eax \n\t" // no eax effect because of the movl below - // except reseting flags. is it needed? - "movl $1, %%eax \n\t" - "cpuid \n\t" - "test $(1<<23), %%edx \n\t" - "jz .NotMMX \n\t" - - "popal \n\t" // popal needed because the address of - "movl $1, %0 \n\t" // variable %0 may be kept in a register - "jmp .noPop \n" - -".NotMMX: \n" -".NotPentium: \n\t" - "popal \n" -".noPop: \n\t" + ("pushal \n\t" // please dont forget this in any asm + "pushfl \n\t" // check whether cpuid supported + "pop %%eax \n\t" + "movl %%eax, %%ebx \n\t" + "xorl $(1<<21), %%eax \n\t" + "pushl %%eax \n\t" + "popfl \n\t" + "pushfl \n\t" + "popl %%eax \n\t" + "xorl %%ebx, %%eax \n\t" + "andl $(1<<21), %%eax \n\t" + "jz .NotPentium \n\t" + "xorl %%eax, %%eax \n\t" // no eax effect because of the movl below + // except reseting flags. is it needed? + "movl $1, %%eax \n\t" + "cpuid \n\t" + "test $(1<<23), %%edx \n\t" + "jz .NotMMX \n\t" + + "popal \n\t" // popal needed because the address of + "movl $1, %0 \n\t" // variable %0 may be kept in a register + "jmp .noPop \n" + +".NotMMX: \n" +".NotPentium: \n\t" + "popal \n" +".noPop: \n\t" : "=m" (result)); @@ -73,9 +73,9 @@ /* * TODO: - * 32/8 24/8 32/16 24/16 32/24 24/24 - * PPlain YES YES - * MMX DONE + * 32/8 24/8 32/16 24/16 32/24 24/24 + * PPlain YES YES + * MMX DONE * * * - try to align stack (local variable space) into quadword boundary @@ -106,191 +106,191 @@ asm volatile ( - "pushal \n\t" + "pushal \n\t" // pack dr, dg and db into mm6 - "movl %7, %%eax \n\t" - "movl %8, %%ebx \n\t" - "movl %9, %%ecx \n\t" - "movw %%ax, %16 \n\t" - "movw %%bx, %17 \n\t" - "movw %%cx, %18 \n\t" - "movw $0, %19 \n\t" + "movl %7, %%eax \n\t" + "movl %8, %%ebx \n\t" + "movl %9, %%ecx \n\t" + "movw %%ax, %16 \n\t" + "movw %%bx, %17 \n\t" + "movw %%cx, %18 \n\t" + "movw $0, %19 \n\t" - "movq %16, %%mm6 \n\t" // dr dg db 0 + "movq %16, %%mm6 \n\t" // dr dg db 0 // pack 4|4|4|4 into mm7, for shifting (/16) - "movl $0x00040004, %16 \n\t" - "movl $0x00040004, %18 \n\t" - "movq %16, %%mm7 \n\t" + "movl $0x00040004, %16 \n\t" + "movl $0x00040004, %18 \n\t" + "movq %16, %%mm7 \n\t" // store constant values for using with mmx when dithering - "movl $0x00070007, %16 \n\t" - "movl $0x00070007, %18 \n\t" - "movq %16, %%mm5 \n\t" - - "movl $0x00050005, %16 \n\t" - "movl $0x00050005, %18 \n\t" - "movq %16, %%mm4 \n\t" - - "movl $0x00030003, %16 \n\t" - "movl $0x00030003, %18 \n\t" - "movq %16, %%mm3 \n\t" + "movl $0x00070007, %16 \n\t" + "movl $0x00070007, %18 \n\t" + "movq %16, %%mm5 \n\t" + + "movl $0x00050005, %16 \n\t" + "movl $0x00050005, %18 \n\t" + "movq %16, %%mm4 \n\t" + + "movl $0x00030003, %16 \n\t" + "movl $0x00030003, %18 \n\t" + "movq %16, %%mm3 \n\t" // process 1 pixel / cycle, each component treated as 16bit - "movl %0, %%esi \n" // esi = image->data + "movl %0, %%esi \n" // esi = image->data -".LoopYa: \n\t" - "movl %13, %%eax \n\t" - "movl %%eax, %26 \n\t" // x = width +".LoopYa: \n\t" + "movl %13, %%eax \n\t" + "movl %%eax, %26 \n\t" // x = width - "movl %14, %%eax \n\t" - "decl %%eax \n\t" // y-- - "movl %%eax, %14 \n\t" - "js .Enda \n\t" // if y < 0, goto end - "andl $1, %%eax \n\t" - "jz .LoopY_1a \n" // if (y&1) goto LoopY_1 + "movl %14, %%eax \n\t" + "decl %%eax \n\t" // y-- + "movl %%eax, %14 \n\t" + "js .Enda \n\t" // if y < 0, goto end + "andl $1, %%eax \n\t" + "jz .LoopY_1a \n" // if (y&1) goto LoopY_1 -".LoopY_0a: \n\t" +".LoopY_0a: \n\t" - "movl %2, %%ebx \n\t" // ebx = err - "movl %%ebx, %25 \n\t" // [-36] = err - "movl %3, %%eax \n\t" // - "movl %%eax, %24 \n\t" // [-32] = nerr + "movl %2, %%ebx \n\t" // ebx = err + "movl %%ebx, %25 \n\t" // [-36] = err + "movl %3, %%eax \n\t" // + "movl %%eax, %24 \n\t" // [-32] = nerr - "jmp .LoopXa \n" + "jmp .LoopXa \n" -".LoopY_1a: \n\t" +".LoopY_1a: \n\t" - "movl %3, %%ebx \n\t" // ebx = nerr - "movl %%ebx, %25 \n\t" // [-36] = nerr - "movl %2, %%eax \n\t" // - "movl %%eax, %24 \n\t" // [-32] = eerr + "movl %3, %%ebx \n\t" // ebx = nerr + "movl %%ebx, %25 \n\t" // [-36] = nerr + "movl %2, %%eax \n\t" // + "movl %%eax, %24 \n\t" // [-32] = eerr - ".align 16 \n" -".LoopXa: \n\t" + ".align 16 \n" +".LoopXa: \n\t" // calculate errors and pixel components // depend on ebx, esi, mm6 - "movq (%%ebx), %%mm1 \n\t" // mm1 = error[0..3] - "punpcklbw (%%esi), %%mm0 \n\t" // mm0 = image->data[0..3] - "psrlw $8, %%mm0 \n\t" // fixup mm0 - "paddusb %%mm1, %%mm0 \n\t" // mm0 = mm0 + mm1 (sat. to 255) - "movq %%mm0, %20 \n\t" // save the pixel + "movq (%%ebx), %%mm1 \n\t" // mm1 = error[0..3] + "punpcklbw (%%esi), %%mm0 \n\t" // mm0 = image->data[0..3] + "psrlw $8, %%mm0 \n\t" // fixup mm0 + "paddusb %%mm1, %%mm0 \n\t" // mm0 = mm0 + mm1 (sat. to 255) + "movq %%mm0, %20 \n\t" // save the pixel - "movzwl %20, %%ecx \n\t" // ecx = pixel.red - "movl %4, %%edi \n\t" // edi = rtable + "movzwl %20, %%ecx \n\t" // ecx = pixel.red + "movl %4, %%edi \n\t" // edi = rtable //agi - "leal (%%edi, %%ecx, 2), %%eax \n\t" // eax = &rtable[pixel.red] + "leal (%%edi, %%ecx, 2), %%eax \n\t" // eax = &rtable[pixel.red] // agi - "movw (%%eax), %%dx \n\t" // dx = rtable[pixel.red] - "movw %%dx, %16 \n\t" // save rr + "movw (%%eax), %%dx \n\t" // dx = rtable[pixel.red] + "movw %%dx, %16 \n\t" // save rr - "movzwl %21, %%ecx \n\t" // ecx = pixel.green - "movl %5, %%edi \n\t" // edi = gtable + "movzwl %21, %%ecx \n\t" // ecx = pixel.green + "movl %5, %%edi \n\t" // edi = gtable //agi - "leal (%%edi, %%ecx, 2), %%eax \n\t" // eax = >able[pixel.green] + "leal (%%edi, %%ecx, 2), %%eax \n\t" // eax = >able[pixel.green] //agi - "movw (%%eax), %%dx \n\t" // dx = gtable[pixel.green] - "movw %%dx, %17 \n\t" // save gg + "movw (%%eax), %%dx \n\t" // dx = gtable[pixel.green] + "movw %%dx, %17 \n\t" // save gg - "movzwl %22, %%ecx \n\t" // ecx = pixel.blue - "movl %6, %%edi \n\t" // ebx = btable + "movzwl %22, %%ecx \n\t" // ecx = pixel.blue + "movl %6, %%edi \n\t" // ebx = btable //agi - "leal (%%edi, %%ecx, 2), %%eax \n\t" // eax = &btable[pixel.blue] + "leal (%%edi, %%ecx, 2), %%eax \n\t" // eax = &btable[pixel.blue] //agi - "movw (%%eax), %%dx \n\t" // dx = btable[pixel.blue] - "movw %%dx, %18 \n\t" // save bb + "movw (%%eax), %%dx \n\t" // dx = btable[pixel.blue] + "movw %%dx, %18 \n\t" // save bb - "movw $0, %19 \n\t" // save dummy aa + "movw $0, %19 \n\t" // save dummy aa - "movq %16, %%mm1 \n\t" // load mm1 with rrggbbaa - "pmullw %%mm6, %%mm1 \n\t" // mm1 = rr*dr|... - "psubsw %%mm1, %%mm0 \n\t" // error = pixel - mm1 + "movq %16, %%mm1 \n\t" // load mm1 with rrggbbaa + "pmullw %%mm6, %%mm1 \n\t" // mm1 = rr*dr|... + "psubsw %%mm1, %%mm0 \n\t" // error = pixel - mm1 // distribute the error // depend on mm0, mm7, mm3, mm4, mm5 - "movl %25, %%ebx \n\t" + "movl %25, %%ebx \n\t" - "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" - "movq %%mm1, 8(%%ebx) \n\t" // err[x+1,y] = rer*7/16 - - - "movl %24, %%ebx \n\t" - - "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" - "movq %%mm1, -8(%%ebx) \n\t" // err[x-1,y+1] += rer*3/16 - - "movq %%mm0, %%mm1 \n\t" - "pmullw %%mm3, %%mm1 \n\t" // mm1 = mm1*3 - "psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16 - "paddw 8(%%ebx), %%mm1 \n\t" - "movq %%mm1, (%%ebx) \n\t" // err[x,y+1] += rer*5/16 + "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" + "movq %%mm1, 8(%%ebx) \n\t" // err[x+1,y] = rer*7/16 + + + "movl %24, %%ebx \n\t" + + "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" + "movq %%mm1, -8(%%ebx) \n\t" // err[x-1,y+1] += rer*3/16 + + "movq %%mm0, %%mm1 \n\t" + "pmullw %%mm3, %%mm1 \n\t" // mm1 = mm1*3 + "psrlw %%mm7, %%mm1 \n\t" // mm1 = mm1/16 + "paddw 8(%%ebx), %%mm1 \n\t" + "movq %%mm1, (%%ebx) \n\t" // err[x,y+1] += rer*5/16 - "psrlw %%mm7, %%mm0 \n\t" // mm0 = mm0/16 - "movq %%mm0, 8(%%ebx) \n\t" // err[x+1,y+1] = rer/16 + "psrlw %%mm7, %%mm0 \n\t" // mm0 = mm0/16 + "movq %%mm0, 8(%%ebx) \n\t" // err[x+1,y+1] = rer/16 // calculate final pixel value and store - "movl %10, %%ecx \n\t" - "movw %16, %%ax \n\t" - "shlw %%cl, %%ax \n\t" //NP* ax = r<data += 4 + "addl $4, %%esi \n\t" // image->data += 4 - "decl %26 \n\t" // x-- - "jnz .LoopXa \n\t" // if x>0, goto .LoopX + "decl %26 \n\t" // x-- + "jnz .LoopXa \n\t" // if x>0, goto .LoopX // depend on edx - "addl %15, %%edx \n\t" // add extra offset to ximage - "movl %%edx, %1 \n\t" + "addl %15, %%edx \n\t" // add extra offset to ximage + "movl %%edx, %1 \n\t" - "jmp .LoopYa \n" + "jmp .LoopYa \n" -".Enda: \n\t" // THE END - "emms \n\t" - "popal \n\t" +".Enda: \n\t" // THE END + "emms \n\t" + "popal \n\t" : : "m" (image), // %0 @@ -354,77 +354,77 @@ asm volatile ( - "pushal \n\t" + "pushal \n\t" - "movl %13, %%eax \n\t" // eax = width - "movl %%eax, %%ebx \n\t" - "shrl $2, %%eax \n\t" - "movl %%eax, %27 \n\t" // w1 = width / 4 - "andl $3, %%ebx \n\t" - "movl %%ebx, %28 \n" // w2 = width %% 4 + "movl %13, %%eax \n\t" // eax = width + "movl %%eax, %%ebx \n\t" + "shrl $2, %%eax \n\t" + "movl %%eax, %27 \n\t" // w1 = width / 4 + "andl $3, %%ebx \n\t" + "movl %%ebx, %28 \n" // w2 = width %% 4 -".LoopYc: \n\t" - "movl %13, %%eax \n\t" - "movl %%eax, %26 \n\t" // x = width +".LoopYc: \n\t" + "movl %13, %%eax \n\t" + "movl %%eax, %26 \n\t" // x = width - "decl %14 \n\t" // height-- - "js .Endc \n\t" // if height < 0 then end + "decl %14 \n\t" // height-- + "js .Endc \n\t" // if height < 0 then end - "movl %14, %%eax \n\t" - "decl %%eax \n\t" // y-- - "movl %%eax, %14 \n\t" - "js .Endc \n\t" // if y < 0, goto end - "andl $1, %%eax \n\t" - "jz .LoopY_1c \n" // if (y&1) goto LoopY_1 + "movl %14, %%eax \n\t" + "decl %%eax \n\t" // y-- + "movl %%eax, %14 \n\t" + "js .Endc \n\t" // if y < 0, goto end + "andl $1, %%eax \n\t" + "jz .LoopY_1c \n" // if (y&1) goto LoopY_1 -".LoopY_0c: \n\t" +".LoopY_0c: \n\t" - "movl %2, %%ebx \n\t" // ebx = err - "movl %%ebx, %25 \n\t" // [-36] = err - "movl %3, %%eax \n\t" // - "movl %%eax, %24 \n\t" // [-32] = nerr + "movl %2, %%ebx \n\t" // ebx = err + "movl %%ebx, %25 \n\t" // [-36] = err + "movl %3, %%eax \n\t" // + "movl %%eax, %24 \n\t" // [-32] = nerr - "jmp .LoopX_1c \n" + "jmp .LoopX_1c \n" -".LoopY_1c: \n\t" +".LoopY_1c: \n\t" - "movl %3, %%ebx \n\t" // ebx = nerr - "movl %%ebx, %25 \n\t" // [-36] = nerr - "movl %2, %%eax \n\t" // - "movl %%eax, %24 \n\t" // [-32] = eerr + "movl %3, %%ebx \n\t" // ebx = nerr + "movl %%ebx, %25 \n\t" // [-36] = nerr + "movl %2, %%eax \n\t" // + "movl %%eax, %24 \n\t" // [-32] = eerr - ".align 16 \n\t" + ".align 16 \n\t" - "movl %%eax, %26 \n" // x = w1 -".LoopX_1c: \n\t" - "decl %26 \n\t" // x-- - "js .Xend1_c \n\t" // if x < 0 then end + "movl %%eax, %26 \n" // x = w1 +".LoopX_1c: \n\t" + "decl %26 \n\t" // x-- + "js .Xend1_c \n\t" // if x < 0 then end // do conversion of 4 pixels - "movq %2, %%mm0 \n\t" // mm0 = err + "movq %2, %%mm0 \n\t" // mm0 = err - "jmp .LoopX_1c \n" -".Xend1_c: \n\t" + "jmp .LoopX_1c \n" +".Xend1_c: \n\t" - "movl %28, %%eax \n\t" - "movl %%eax, %26 \n" // x = w2 -".LoopX_2c: \n\t" - "decl %26 \n\t" // x-- - "js .Xend2_c \n\t" // + "movl %28, %%eax \n\t" + "movl %%eax, %26 \n" // x = w2 +".LoopX_2c: \n\t" + "decl %26 \n\t" // x-- + "js .Xend2_c \n\t" // // do conversion - "jmp .LoopX_2c \n" -".Xend2_c: \n\t" + "jmp .LoopX_2c \n" +".Xend2_c: \n\t" - "movl %27, %%eax \n\t" - "jmp .LoopYc \n" + "movl %27, %%eax \n\t" + "jmp .LoopYc \n" -".Endc: \n\t" // THE END - "emms \n\t" - "popal \n\t" +".Endc: \n\t" // THE END + "emms \n\t" + "popal \n\t" : : "m" (image), // %0 @@ -497,234 +497,234 @@ asm volatile ( - "pushal \n\t" + "pushal \n\t" - "movl %9, %%eax \n\t" - "mulb %9 \n\t" - "movl %%eax, %15 \n\t" // cpcpc = cpc*cpc + "movl %9, %%eax \n\t" + "mulb %9 \n\t" + "movl %%eax, %15 \n\t" // cpcpc = cpc*cpc // eax will always be <= 0xffff // process 1 pixel / cycle, each component treated as 16bit - "movl %0, %%esi \n" // esi = image->data + "movl %0, %%esi \n" // esi = image->data -".LoopYb: \n\t" - "movl %10, %%ecx \n\t" - "movl %%ecx, %14 \n\t" // x = width +".LoopYb: \n\t" + "movl %10, %%ecx \n\t" + "movl %%ecx, %14 \n\t" // x = width - "movl %11, %%ecx \n\t" - "decl %%ecx \n\t" // y-- - "movl %%ecx, %11 \n\t" - "js .Endb \n\t" // if y < 0, goto end - "andl $1, %%ecx \n\t" - "jz .LoopY_1b \n" // if (y&1) goto LoopY_1 + "movl %11, %%ecx \n\t" + "decl %%ecx \n\t" // y-- + "movl %%ecx, %11 \n\t" + "js .Endb \n\t" // if y < 0, goto end + "andl $1, %%ecx \n\t" + "jz .LoopY_1b \n" // if (y&1) goto LoopY_1 -".LoopY_0b: \n\t" +".LoopY_0b: \n\t" - "movl %2, %%ebx \n\t" // ebx = err -//useless "movl %%ebx, %20 \n\t" // [-36] = err - "movl %3, %%ecx \n\t" // - "movl %%ecx, %19 \n\t" // [-32] = nerr + "movl %2, %%ebx \n\t" // ebx = err +//useless "movl %%ebx, %20 \n\t" // [-36] = err + "movl %3, %%ecx \n\t" // + "movl %%ecx, %19 \n\t" // [-32] = nerr - "movl $0, (%%ecx) \n\t" // init error of nerr[0] to 0 + "movl $0, (%%ecx) \n\t" // init error of nerr[0] to 0 - "jmp .LoopXb \n" + "jmp .LoopXb \n" -".LoopY_1b: \n\t" +".LoopY_1b: \n\t" - "movl %3, %%ebx \n\t" // ebx = nerr -//useless "movl %%ebx, %20 \n\t" // [-36] = nerr - "movl %2, %%ecx \n\t" // - "movl %%ecx, %19 \n\t" // [-32] = err + "movl %3, %%ebx \n\t" // ebx = nerr +//useless "movl %%ebx, %20 \n\t" // [-36] = nerr + "movl %2, %%ecx \n\t" // + "movl %%ecx, %19 \n\t" // [-32] = err - "movl $0, (%%ecx) \n\t" // init error of nerr[0] to 0 + "movl $0, (%%ecx) \n\t" // init error of nerr[0] to 0 - ".align 16 \n" -".LoopXb: \n\t" + ".align 16 \n" +".LoopXb: \n\t" - "movl %4, %%edi \n\t" // edi = ctable - "xorl %%edx, %%edx \n\t" // zero the upper word on edx + "movl %4, %%edi \n\t" // edi = ctable + "xorl %%edx, %%edx \n\t" // zero the upper word on edx // RED // depends on ebx==err, esi==image->data, edi - "movzbw (%%esi), %%dx \n\t" // dx = image->data[0] - "movsbw (%%ebx), %%ax \n\t" // ax = error[0] - "addw %%ax, %%dx \n\t" // pixel.red = data[0] + error[0] - - "testb %%dh, %%dh \n\t" // test if pixel.red < 0 or > 255 - "jz .OKRb \n\t" // 0 <= pixel.red <= 255 - "js .NEGRb \n\t" // pixel.red < 0 - "movw $0xff, %%dx \n\t" // pixel.red > 255 - "jmp .OKRb \n" -".NEGRb: \n\t" - "xorw %%dx, %%dx \n" -".OKRb: \n\t" + "movzbw (%%esi), %%dx \n\t" // dx = image->data[0] + "movsbw (%%ebx), %%ax \n\t" // ax = error[0] + "addw %%ax, %%dx \n\t" // pixel.red = data[0] + error[0] + + "testb %%dh, %%dh \n\t" // test if pixel.red < 0 or > 255 + "jz .OKRb \n\t" // 0 <= pixel.red <= 255 + "js .NEGRb \n\t" // pixel.red < 0 + "movw $0xff, %%dx \n\t" // pixel.red > 255 + "jmp .OKRb \n" +".NEGRb: \n\t" + "xorw %%dx, %%dx \n" +".OKRb: \n\t" //partial reg - "leal (%%edi, %%edx, 2), %%ecx \n\t" // ecx = &ctable[pixel.red] + "leal (%%edi, %%edx, 2), %%ecx \n\t" // ecx = &ctable[pixel.red] //agi - "movl (%%ecx), %%eax \n\t" // ax = ctable[pixel.red] - "movw %%ax, %16 \n\t" // save rr + "movl (%%ecx), %%eax \n\t" // ax = ctable[pixel.red] + "movw %%ax, %16 \n\t" // save rr - "mulb %5 \n\t" // ax = rr*dr - "subw %%ax, %%dx \n\t" // rer = dx = dx - rr*dr + "mulb %5 \n\t" // ax = rr*dr + "subw %%ax, %%dx \n\t" // rer = dx = dx - rr*dr - "movswl %%dx, %%eax \n\t" // save rer + "movswl %%dx, %%eax \n\t" // save rer // distribute error - "leal (, %%eax, 8), %%ecx \n\t" - "subw %%dx, %%cx \n\t" // cx = rer * 7 - "sarw $4, %%cx \n\t" // cx = rer * 7 / 16 - "addb %%cl, 4(%%ebx) \n\t" // err[x+1] += rer * 7 / 16 - - "movl %19, %%ecx \n\t" // ecx = nerr - - "leaw (%%eax, %%eax, 4), %%dx \n\t" // dx = rer * 5 - "sarw $4, %%dx \n\t" // dx = rer * 5 / 16 - "addb %%dl, (%%ecx) \n\t" // nerr[x] += rer * 5 / 16 - - "leaw (%%eax, %%eax, 2), %%dx \n\t" // dx = rer * 3 - "sarw $4, %%dx \n\t" // dx = rer * 3 / 16 - "addb %%dl, -4(%%ecx) \n\t" // nerr[x-1] += rer * 3 / 16 + "leal (, %%eax, 8), %%ecx \n\t" + "subw %%dx, %%cx \n\t" // cx = rer * 7 + "sarw $4, %%cx \n\t" // cx = rer * 7 / 16 + "addb %%cl, 4(%%ebx) \n\t" // err[x+1] += rer * 7 / 16 + + "movl %19, %%ecx \n\t" // ecx = nerr + + "leaw (%%eax, %%eax, 4), %%dx \n\t" // dx = rer * 5 + "sarw $4, %%dx \n\t" // dx = rer * 5 / 16 + "addb %%dl, (%%ecx) \n\t" // nerr[x] += rer * 5 / 16 + + "leaw (%%eax, %%eax, 2), %%dx \n\t" // dx = rer * 3 + "sarw $4, %%dx \n\t" // dx = rer * 3 / 16 + "addb %%dl, -4(%%ecx) \n\t" // nerr[x-1] += rer * 3 / 16 - "sarw $4, %%ax \n\t" // ax = rer / 16 - "movb %%al, 4(%%ecx) \n\t" // nerr[x+1] = rer / 16 + "sarw $4, %%ax \n\t" // ax = rer / 16 + "movb %%al, 4(%%ecx) \n\t" // nerr[x+1] = rer / 16 // GREEN // depends on ebx, esi, edi - "movzbw 1(%%esi), %%dx \n\t" // dx = image->data[1] - "movsbw 1(%%ebx), %%ax \n\t" // ax = error[1] - "addw %%ax, %%dx \n\t" // pixel.grn = data[1] + error[1] - - "testb %%dh, %%dh \n\t" // test if pixel.grn < 0 or > 255 - "jz .OKGb \n\t" // 0 <= pixel.grn <= 255 - "js .NEGGb \n\t" // pixel.grn < 0 - "movw $0xff, %%dx \n\t" // pixel.grn > 255 - "jmp .OKGb \n" -".NEGGb: \n\t" - "xorw %%dx, %%dx \n" -".OKGb: \n\t" + "movzbw 1(%%esi), %%dx \n\t" // dx = image->data[1] + "movsbw 1(%%ebx), %%ax \n\t" // ax = error[1] + "addw %%ax, %%dx \n\t" // pixel.grn = data[1] + error[1] + + "testb %%dh, %%dh \n\t" // test if pixel.grn < 0 or > 255 + "jz .OKGb \n\t" // 0 <= pixel.grn <= 255 + "js .NEGGb \n\t" // pixel.grn < 0 + "movw $0xff, %%dx \n\t" // pixel.grn > 255 + "jmp .OKGb \n" +".NEGGb: \n\t" + "xorw %%dx, %%dx \n" +".OKGb: \n\t" // partial reg - "leal (%%edi, %%edx, 2), %%ecx \n\t" // ecx = &ctable[pixel.grn] + "leal (%%edi, %%edx, 2), %%ecx \n\t" // ecx = &ctable[pixel.grn] //agi - "movw (%%ecx), %%ax \n\t" // ax = ctable[pixel.grn] - "movw %%ax, %17 \n\t" // save gg + "movw (%%ecx), %%ax \n\t" // ax = ctable[pixel.grn] + "movw %%ax, %17 \n\t" // save gg - "mulb %6 \n\t" // ax = gg*dg - "subw %%ax, %%dx \n\t" // ger = dx = dx - gg*dg + "mulb %6 \n\t" // ax = gg*dg + "subw %%ax, %%dx \n\t" // ger = dx = dx - gg*dg - "movswl %%dx, %%eax \n\t" // save ger + "movswl %%dx, %%eax \n\t" // save ger // distribute error - "leal (, %%eax, 8), %%ecx \n\t" - "subw %%dx, %%cx \n\t" // cx = ger * 7 - "sarw $4, %%cx \n\t" // cx = ger * 7 / 16 - "addb %%cl, 5(%%ebx) \n\t" // err[x+1] += ger * 7 / 16 - - "movl %19, %%ecx \n\t" // ecx = nerr - - "leaw (%%eax, %%eax, 4), %%dx \n\t" // dx = ger * 5 - "sarw $4, %%dx \n\t" // dx = ger * 5 / 16 - "addb %%dl, 1(%%ecx) \n\t" // nerr[x] += ger * 5 / 16 - - "leaw (%%eax, %%eax, 2), %%dx \n\t" // dx = ger * 3 - "sarw $4, %%dx \n\t" // dx = ger * 3 / 16 - "addb %%dl, -3(%%ecx) \n\t" // nerr[x-1] += ger * 3 / 16 + "leal (, %%eax, 8), %%ecx \n\t" + "subw %%dx, %%cx \n\t" // cx = ger * 7 + "sarw $4, %%cx \n\t" // cx = ger * 7 / 16 + "addb %%cl, 5(%%ebx) \n\t" // err[x+1] += ger * 7 / 16 + + "movl %19, %%ecx \n\t" // ecx = nerr + + "leaw (%%eax, %%eax, 4), %%dx \n\t" // dx = ger * 5 + "sarw $4, %%dx \n\t" // dx = ger * 5 / 16 + "addb %%dl, 1(%%ecx) \n\t" // nerr[x] += ger * 5 / 16 + + "leaw (%%eax, %%eax, 2), %%dx \n\t" // dx = ger * 3 + "sarw $4, %%dx \n\t" // dx = ger * 3 / 16 + "addb %%dl, -3(%%ecx) \n\t" // nerr[x-1] += ger * 3 / 16 - "sarw $4, %%ax \n\t" // ax = ger / 16 - "movb %%al, 5(%%ecx) \n\t" // nerr[x+1] = ger / 16 + "sarw $4, %%ax \n\t" // ax = ger / 16 + "movb %%al, 5(%%ecx) \n\t" // nerr[x+1] = ger / 16 // BLUE // depends on ebx, esi - "movzbw 2(%%esi), %%dx \n\t" // dx = image->data[2] - "movsbw 2(%%ebx), %%ax \n\t" // ax = error[2] - "addw %%ax, %%dx \n\t" // pixel.grn = data[2] + error[2] - - "testb %%dh, %%dh \n\t" // test if pixel.blu < 0 or > 255 - "jz .OKBb \n\t" // 0 <= pixel.blu <= 255 - "js .NEGBb \n\t" // pixel.blu < 0 - "movw $0xff, %%dx \n\t" // pixel.blu > 255 - "jmp .OKBb \n" -".NEGBb: \n\t" - "xorw %%dx, %%dx \n" -".OKBb: \n\t" + "movzbw 2(%%esi), %%dx \n\t" // dx = image->data[2] + "movsbw 2(%%ebx), %%ax \n\t" // ax = error[2] + "addw %%ax, %%dx \n\t" // pixel.grn = data[2] + error[2] + + "testb %%dh, %%dh \n\t" // test if pixel.blu < 0 or > 255 + "jz .OKBb \n\t" // 0 <= pixel.blu <= 255 + "js .NEGBb \n\t" // pixel.blu < 0 + "movw $0xff, %%dx \n\t" // pixel.blu > 255 + "jmp .OKBb \n" +".NEGBb: \n\t" + "xorw %%dx, %%dx \n" +".OKBb: \n\t" //partial reg - "leal (%%edi, %%edx, 2), %%ecx \n\t" // ecx = &ctable[pixel.blu] + "leal (%%edi, %%edx, 2), %%ecx \n\t" // ecx = &ctable[pixel.blu] //agi - "movw (%%ecx), %%ax \n\t" // ax = ctable[pixel.blu] - "movw %%ax, %18 \n\t" // save bb + "movw (%%ecx), %%ax \n\t" // ax = ctable[pixel.blu] + "movw %%ax, %18 \n\t" // save bb - "mulb %7 \n\t" // ax = bb*db - "subw %%ax, %%dx \n\t" // ber = dx = dx - bb*db - "movswl %%dx, %%eax \n\t" // save ber + "mulb %7 \n\t" // ax = bb*db + "subw %%ax, %%dx \n\t" // ber = dx = dx - bb*db + "movswl %%dx, %%eax \n\t" // save ber // distribute error - "leal (, %%eax, 8), %%ecx \n\t" - "subw %%dx, %%cx \n\t" // cx = ber * 7 - "sarw $4, %%cx \n\t" // cx = ber * 7 / 16 - "addb %%cl, 6(%%ebx) \n\t" // err[x+1] += ber * 7 / 16 + "leal (, %%eax, 8), %%ecx \n\t" + "subw %%dx, %%cx \n\t" // cx = ber * 7 + "sarw $4, %%cx \n\t" // cx = ber * 7 / 16 + "addb %%cl, 6(%%ebx) \n\t" // err[x+1] += ber * 7 / 16 - "movl %19, %%ecx \n\t" // ecx = nerr + "movl %19, %%ecx \n\t" // ecx = nerr - "leaw (%%eax, %%eax, 4), %%dx \n\t" // dx = ber * 5 - "sarw $4, %%dx \n\t" // dx = ber * 5 / 16 - "addb %%dl, 2(%%ecx) \n\t" // nerr[x] += ber * 5 / 16 + "leaw (%%eax, %%eax, 4), %%dx \n\t" // dx = ber * 5 + "sarw $4, %%dx \n\t" // dx = ber * 5 / 16 + "addb %%dl, 2(%%ecx) \n\t" // nerr[x] += ber * 5 / 16 - "leaw (%%eax, %%eax, 2), %%dx \n\t" // dx = ber * 3 - "sarw $4, %%dx \n\t" // dx = ber * 3 / 16 - "addb %%dl, -4(%%ecx) \n\t" // nerr[x-1] += ber * 3 / 16 + "leaw (%%eax, %%eax, 2), %%dx \n\t" // dx = ber * 3 + "sarw $4, %%dx \n\t" // dx = ber * 3 / 16 + "addb %%dl, -4(%%ecx) \n\t" // nerr[x-1] += ber * 3 / 16 - "sarw $4, %%ax \n\t" // ax = ber / 16 - "movb %%al, 6(%%ecx) \n\t" // nerr[x+1] = ber / 16 + "sarw $4, %%ax \n\t" // ax = ber / 16 + "movb %%al, 6(%%ecx) \n\t" // nerr[x+1] = ber / 16 - "andl $0xffff, %%eax \n\t" + "andl $0xffff, %%eax \n\t" // depends on eax & 0xffff0000 == 0 // calculate the index of the value of the pixel - "movw %16, %%ax \n\t" // ax = rr - "mulb %15 \n\t" // ax = cpcpc*rr - "movw %%ax, %%cx \n\t" - "movw %17, %%ax \n\t" // ax = gg - "mulb %9 \n\t" // ax = cpc*gg - "addw %%cx, %%ax \n\t" // ax = cpc*gg + cpcpc*rr - "addw %18, %%ax \n\t" // ax = cpcpc*rr + cpc*gg + bb + "movw %16, %%ax \n\t" // ax = rr + "mulb %15 \n\t" // ax = cpcpc*rr + "movw %%ax, %%cx \n\t" + "movw %17, %%ax \n\t" // ax = gg + "mulb %9 \n\t" // ax = cpc*gg + "addw %%cx, %%ax \n\t" // ax = cpc*gg + cpcpc*rr + "addw %18, %%ax \n\t" // ax = cpcpc*rr + cpc*gg + bb - "movl %8, %%ecx \n\t" + "movl %8, %%ecx \n\t" //agi - "leal (%%ecx, %%eax, 4), %%edx \n\t" + "leal (%%ecx, %%eax, 4), %%edx \n\t" //agi - "movb (%%edx), %%cl \n\t" // cl = pixels[ax] + "movb (%%edx), %%cl \n\t" // cl = pixels[ax] // store the pixel - "movl %1, %%eax \n\t" - "movb %%cl, (%%eax) \n\t" // *ximage = cl - "incl %1 \n\t" // ximage++ + "movl %1, %%eax \n\t" + "movb %%cl, (%%eax) \n\t" // *ximage = cl + "incl %1 \n\t" // ximage++ // prepare for next iteration on X - "addl $4, %19 \n\t" // nerr += 4 - "addl $4, %%ebx \n\t" // err += 4 + "addl $4, %19 \n\t" // nerr += 4 + "addl $4, %%ebx \n\t" // err += 4 - "addl %12, %%esi \n\t" // image->data += bpp + "addl %12, %%esi \n\t" // image->data += bpp - "decl %14 \n\t" // x-- - "jnz .LoopXb \n\t" // if x>0, goto .LoopX + "decl %14 \n\t" // x-- + "jnz .LoopXb \n\t" // if x>0, goto .LoopX - "movl %13, %%eax \n\t" - "addl %%eax, %1 \n\t" // add extra offset to ximage + "movl %13, %%eax \n\t" + "addl %%eax, %1 \n\t" // add extra offset to ximage - "jmp .LoopYb \n" + "jmp .LoopYb \n" -".Endb: \n\t" - "emms \n\t" - "popal \n\t" +".Endb: \n\t" + "emms \n\t" + "popal \n\t" : : "m" (image), // %0